runtime: remove walltime function

There was only one meaningful caller, which changes to call time_now.

This clearly separates systems that use walltime1 to be just those
that use the stub version of time_now. That is to say, those that do
not provide an assembler version of time_now.

Change-Id: I14c06cc402070bd705f953af6f9966785015e2a5
Reviewed-on: https://go-review.googlesource.com/c/go/+/314769
Trust: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Michael Knyszek <mknyszek@google.com>

diff --git a/src/runtime/time_fake.go b/src/runtime/time_fake.go
index 9d9a1e2ca680be4c2f89ddbe7c033277442cf5b7..c790faba3d6b75744b7a9afdba58e2c22183ede0 100644 (file)
--- a/src/runtime/time_fake.go
+++ b/src/runtime/time_fake.go
@@ -37,14 +37,9 @@ func nanotime() int64 {
        return faketime
 }
 
-func walltime() (sec int64, nsec int32) {
-       return faketime / 1000000000, int32(faketime % 1000000000)
-}
-
 //go:linkname time_now time.now
 func time_now() (sec int64, nsec int32, mono int64) {
-       sec, nsec = walltime()
-       return sec, nsec, nanotime()
+       return faketime / 1e9, int32(faketime % 1e9), faketime
 }
 
 func write(fd uintptr, p unsafe.Pointer, n int32) int32 {

diff --git a/src/runtime/time_nofake.go b/src/runtime/time_nofake.go
index 13bf1c2d4fb4ddd955f6e9216df9b9756817bc40..5a4ceaf43d280ceacd4fec036405316ae0f32ea1 100644 (file)
--- a/src/runtime/time_nofake.go
+++ b/src/runtime/time_nofake.go
@@ -20,10 +20,6 @@ func nanotime() int64 {
        return nanotime1()
 }
 
-func walltime() (sec int64, nsec int32) {
-       return walltime1()
-}
-
 // write must be nosplit on Windows (see write1)
 //
 //go:nosplit

diff --git a/src/runtime/timestub.go b/src/runtime/timestub.go
index 6f16c70b8160b18a0d1131230914c6a63a5ea88a..44e65845cb95dfbcd8acb3fdbdc0465a29c1d1ba 100644 (file)
--- a/src/runtime/timestub.go
+++ b/src/runtime/timestub.go
@@ -16,6 +16,6 @@ import _ "unsafe" // for go:linkname
 
 //go:linkname time_now time.now
 func time_now() (sec int64, nsec int32, mono int64) {
-       sec, nsec = walltime()
+       sec, nsec = walltime1()
        return sec, nsec, nanotime()
 }

diff --git a/src/runtime/write_err_android.go b/src/runtime/write_err_android.go
index 2419fc8663e4cdb501094b99a2aadd06ede6e0cb..a876900c95481a4a222e112969e45693a1f445cf 100644 (file)
--- a/src/runtime/write_err_android.go
+++ b/src/runtime/write_err_android.go
@@ -144,7 +144,7 @@ func writeLogdHeader() int {
        //      hdr[3:7] sec unsigned uint32, little endian.
        //      hdr[7:11] nsec unsigned uint32, little endian.
        hdr[0] = 0 // LOG_ID_MAIN
-       sec, nsec := walltime()
+       sec, nsec, _ := time_now()
        packUint32(hdr[3:7], uint32(sec))
        packUint32(hdr[7:11], uint32(nsec))