unix: make TimevalToNsec available everywhere

bradfitz · bradfitz · commit afce3de5756c · 2016-03-22T23:22:43.000Z
It wasn't in linux/arm. Tested with: $ for x in $(go tool dist list ) ; do \ export GOOS=$(echo $x | cut -d/ -f1); \ export GOARCH=$(echo $x | cut -d/ -f2); \ echo "$GOOS; $GOARCH"; go install .; done ... which all pass, except openbsd/arm which is still broken exactly how it was broken previously. Fixes golang/go#14643 Change-Id: Ie7ae861b581b539178de26f15ba3f4bdd0e9b785 Reviewed-on: https://go-review.googlesource.com/21013 Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/unix/syscall.go b/unix/syscall.go
@@ -68,6 +68,8 @@ func (tv *Timeval) Nano() int64 {
 	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
 }
 
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+
 // use is a no-op, but the compiler cannot see that it is.
 // Calling use(p) ensures that p is kept live until that point.
 //go:noescape
diff --git a/unix/syscall_darwin_386.go b/unix/syscall_darwin_386.go
@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_darwin_amd64.go b/unix/syscall_darwin_amd64.go
@@ -23,8 +23,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_darwin_arm.go b/unix/syscall_darwin_arm.go
@@ -19,8 +19,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_darwin_arm64.go b/unix/syscall_darwin_arm64.go
@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_dragonfly_386.go b/unix/syscall_dragonfly_386.go
@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_dragonfly_amd64.go b/unix/syscall_dragonfly_amd64.go
@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3
diff --git a/unix/syscall_freebsd_386.go b/unix/syscall_freebsd_386.go
@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_freebsd_amd64.go b/unix/syscall_freebsd_amd64.go
@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3
diff --git a/unix/syscall_freebsd_arm.go b/unix/syscall_freebsd_arm.go
@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return tv.Sec*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_linux_386.go b/unix/syscall_linux_386.go
@@ -24,8 +24,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Sec = int32(nsec / 1e9)
diff --git a/unix/syscall_linux_amd64.go b/unix/syscall_linux_amd64.go
@@ -96,8 +96,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Sec = nsec / 1e9
diff --git a/unix/syscall_linux_arm64.go b/unix/syscall_linux_arm64.go
@@ -79,8 +79,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Sec = nsec / 1e9
diff --git a/unix/syscall_linux_mips64x.go b/unix/syscall_linux_mips64x.go
@@ -85,8 +85,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Sec = nsec / 1e9
diff --git a/unix/syscall_linux_ppc64x.go b/unix/syscall_linux_ppc64x.go
@@ -73,8 +73,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Sec = nsec / 1e9
diff --git a/unix/syscall_netbsd_386.go b/unix/syscall_netbsd_386.go
@@ -16,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_netbsd_amd64.go b/unix/syscall_netbsd_amd64.go
@@ -16,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_netbsd_arm.go b/unix/syscall_netbsd_arm.go
@@ -16,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_openbsd_386.go b/unix/syscall_openbsd_386.go
@@ -16,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = int32(nsec % 1e9 / 1e3)
diff --git a/unix/syscall_openbsd_amd64.go b/unix/syscall_openbsd_amd64.go
@@ -16,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3
diff --git a/unix/syscall_solaris_amd64.go b/unix/syscall_solaris_amd64.go
@@ -14,8 +14,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return
 }
 
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
-
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999 // round up to microsecond
 	tv.Usec = nsec % 1e9 / 1e3

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ func (tv *Timeval) Nano() int64 {`
`68`	`68`	`return int64(tv.Sec)1e9 + int64(tv.Usec)1000`
`69`	`69`	`}`
`70`	`70`
	`71`	`+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
	`72`	`+`
`71`	`73`	`// use is a no-op, but the compiler cannot see that it is.`
`72`	`74`	`// Calling use(p) ensures that p is kept live until that point.`
`73`	`75`	`//go:noescape`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`21`	`21`	`return`
`22`	`22`	`}`
`23`	`23`
`24`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`25`		`-`
`26`	`24`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`27`	`25`	`nsec += 999 // round up to microsecond`
`28`	`26`	`tv.Usec = int32(nsec % 1e9 / 1e3)`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`23`	`23`	`return`
`24`	`24`	`}`
`25`	`25`
`26`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`27`		`-`
`28`	`26`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`29`	`27`	`nsec += 999 // round up to microsecond`
`30`	`28`	`tv.Usec = int32(nsec % 1e9 / 1e3)`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`19`	`19`	`return`
`20`	`20`	`}`
`21`	`21`
`22`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`23`		`-`
`24`	`22`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`25`	`23`	`nsec += 999 // round up to microsecond`
`26`	`24`	`tv.Usec = int32(nsec % 1e9 / 1e3)`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`24`	`24`	`return`
`25`	`25`	`}`
`26`	`26`
`27`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`28`		`-`
`29`	`27`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`30`	`28`	`nsec += 999 // round up to microsecond`
`31`	`29`	`tv.Sec = int32(nsec / 1e9)`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`96`	`96`	`return`
`97`	`97`	`}`
`98`	`98`
`99`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`100`		`-`
`101`	`99`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`102`	`100`	`nsec += 999 // round up to microsecond`
`103`	`101`	`tv.Sec = nsec / 1e9`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`79`	`79`	`return`
`80`	`80`	`}`
`81`	`81`
`82`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`83`		`-`
`84`	`82`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`85`	`83`	`nsec += 999 // round up to microsecond`
`86`	`84`	`tv.Sec = nsec / 1e9`
Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`85`	`85`	`return`
`86`	`86`	`}`
`87`	`87`
`88`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`89`		`-`
`90`	`88`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`91`	`89`	`nsec += 999 // round up to microsecond`
`92`	`90`	`tv.Sec = nsec / 1e9`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`73`	`73`	`return`
`74`	`74`	`}`
`75`	`75`
`76`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`77`		`-`
`78`	`76`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`79`	`77`	`nsec += 999 // round up to microsecond`
`80`	`78`	`tv.Sec = nsec / 1e9`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ func NsecToTimespec(nsec int64) (ts Timespec) {`
`16`	`16`	`return`
`17`	`17`	`}`
`18`	`18`
`19`		`-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)1e9 + int64(tv.Usec)1e3 }`
`20`		`-`
`21`	`19`	`func NsecToTimeval(nsec int64) (tv Timeval) {`
`22`	`20`	`nsec += 999 // round up to microsecond`
`23`	`21`	`tv.Usec = int32(nsec % 1e9 / 1e3)`