diff options
| author | Ian Lance Taylor <iant@golang.org> | 2021-04-28 11:10:07 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2021-04-29 04:19:20 +0000 |
| commit | 42953bc9f5ded1bcf4ff727d82ddd3b7a8a2b8de (patch) | |
| tree | b79982499d0ec93a322a1f425841d5568134a35d /src/runtime | |
| parent | d09947522d1fbe17d6a8aece07d70e31a3a5311e (diff) | |
| download | go-42953bc9f5ded1bcf4ff727d82ddd3b7a8a2b8de.tar.gz go-42953bc9f5ded1bcf4ff727d82ddd3b7a8a2b8de.zip | |
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>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/time_fake.go | 7 | ||||
| -rw-r--r-- | src/runtime/time_nofake.go | 4 | ||||
| -rw-r--r-- | src/runtime/timestub.go | 2 | ||||
| -rw-r--r-- | src/runtime/write_err_android.go | 2 |
4 files changed, 3 insertions, 12 deletions
diff --git a/src/runtime/time_fake.go b/src/runtime/time_fake.go index 9d9a1e2ca6..c790faba3d 100644 --- 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 13bf1c2d4f..5a4ceaf43d 100644 --- 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 6f16c70b81..44e65845cb 100644 --- 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 2419fc8663..a876900c95 100644 --- 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)) |