Unify platform-specific files using generics and !linux tags

calnex/verify/checks/ping_test.go

@@ -1,6 +1,3 @@
-//go:build !race
-// +build !race
-
 /*
 Copyright (c) Facebook, Inc. and its affiliates.
 

clock/clock_64bit_darwin.go → clock/clock_setters.go

@@ -1,5 +1,3 @@
-//go:build darwin && !386
-
 /*
 Copyright (c) Facebook, Inc. and its affiliates.
 
@@ -24,11 +22,17 @@ import (
 	"github.com/facebook/time/phc/unix"
 )
 
+type timexInt interface{ ~int32 | ~int64 }
+
+func setTimexField[T timexInt](field *T, val float64) {
+	*field = T(val)
+}
+
 func setFreq(tx *unix.Timex, freqPPB float64) {
-	tx.Freq = int64(freqPPB * PPBToTimexPPM)
+	setTimexField(&tx.Freq, freqPPB*PPBToTimexPPM)
 }
 
 func setTime(tx *unix.Timex, sec, usec time.Duration) {
-	tx.Time.Sec = int64(sec)
-	tx.Time.Usec = int32(usec)
+	setTimexField(&tx.Time.Sec, float64(sec))
+	setTimexField(&tx.Time.Usec, float64(usec))
 }

cmd/ntpcheck/cmd/utils_track.go

@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/facebook/time/phc/unix"
 	"github.com/spf13/cobra"
-	"golang.org/x/sys/unix"
 )
 
 func getRawMonotonic() float64 {

ntp/responder/server/server_darwin.go → ntp/responder/server/server_notlinux.go

@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
 Copyright (c) Facebook, Inc. and its affiliates.
 
@@ -76,7 +78,7 @@ func deleteIfaceIP(iface *net.Interface, addr *net.IP) error {
 }
 
 // PHCOffset periodically checks for PHC-SYS offset and updates it in the config
-// PHC reading is not supported on Darwin
+// PHC reading is not supported on this platform
 func phcOffset(_ string) (time.Duration, error) {
 	return 0, nil
 }

ntp/responder/server/server_freebsd_test.go → ntp/responder/server/server_notlinux_test.go

@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
 Copyright (c) Facebook, Inc. and its affiliates.
 

phc/unix/linux.go

@@ -192,6 +192,7 @@ const (
 	SYS_CLOCK_SETTIME             = unix.SYS_CLOCK_SETTIME             //nolint:revive
 	TIME_OK                       = unix.TIME_OK                       //nolint:revive
 	CLOCK_BOOTTIME                = unix.CLOCK_BOOTTIME                //nolint:revive
+	CLOCK_MONOTONIC_RAW           = unix.CLOCK_MONOTONIC_RAW           //nolint:revive
 )
 
 var (

phc/unix/notlinux.go

@@ -34,9 +34,11 @@ type Timex struct {
 // Linux-only constants that need stub values on Darwin
 //
 //nolint:revive
+//nolint:revive
 const (
-	TIME_OK        = 0
-	CLOCK_BOOTTIME = 7
+	TIME_OK             = 0
+	CLOCK_BOOTTIME      = 7
+	CLOCK_MONOTONIC_RAW = 4
 )
 
 // FdToClockID is not supported on non-linux.

phc/unix/types.go

@@ -165,10 +165,9 @@ const (
 	POLLPRI             = unix.POLLPRI
 	SizeofPtr           = unix.SizeofPtr
 	SizeofSockaddrInet4 = unix.SizeofSockaddrInet4
-	SOCK_DGRAM          = unix.SOCK_DGRAM          //nolint:revive
-	SOL_SOCKET          = unix.SOL_SOCKET          //nolint:revive
-	SO_RCVTIMEO         = unix.SO_RCVTIMEO         //nolint:revive
-	SO_TIMESTAMP        = unix.SO_TIMESTAMP        //nolint:revive
-	CLOCK_REALTIME      = unix.CLOCK_REALTIME      //nolint:revive
-	CLOCK_MONOTONIC_RAW = unix.CLOCK_MONOTONIC_RAW //nolint:revive
+	SOCK_DGRAM          = unix.SOCK_DGRAM     //nolint:revive
+	SOL_SOCKET          = unix.SOL_SOCKET     //nolint:revive
+	SO_RCVTIMEO         = unix.SO_RCVTIMEO    //nolint:revive
+	SO_TIMESTAMP        = unix.SO_TIMESTAMP   //nolint:revive
+	CLOCK_REALTIME      = unix.CLOCK_REALTIME //nolint:revive
 )