diff options
| author | Jerrin Shaji George <jerrinsg@gmail.com> | 2019-10-07 12:27:33 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2019-10-11 20:01:28 +0000 |
| commit | 2df5cdbadf5fbcb23f017c9f00b75dc341a69adf (patch) | |
| tree | b56a5b279afdaf5e91a2fd4682184639455eef6d /src/runtime/sys_solaris_amd64.s | |
| parent | c1ccae4d149ac23b376d17fdef486e631a92f775 (diff) | |
| download | go-2df5cdbadf5fbcb23f017c9f00b75dc341a69adf.tar.gz go-2df5cdbadf5fbcb23f017c9f00b75dc341a69adf.zip | |
runtime: make nanotime use monotonic clock in Solaris
nanotime() currently uses the REALTIME clock to get the elapsed
time in Solaris. This commit changes it to use the MONOTONIC clock
instead, similar to how it's done in Linux and other OSs. Also changed
nanotime() and walltime() to call clock_gettime() library function
directly from Go code rather than from assembly.
Fixes #33674
Change-Id: Ie4a687b17d2140998ecd97af6ce048c86cf5fc02
Reviewed-on: https://go-review.googlesource.com/c/go/+/199502
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Aram Hăvărneanu <aram@mgk.ro>
Diffstat (limited to 'src/runtime/sys_solaris_amd64.s')
| -rw-r--r-- | src/runtime/sys_solaris_amd64.s | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/runtime/sys_solaris_amd64.s b/src/runtime/sys_solaris_amd64.s index bd5f7736ad..05fd187517 100644 --- a/src/runtime/sys_solaris_amd64.s +++ b/src/runtime/sys_solaris_amd64.s @@ -29,26 +29,6 @@ TEXT runtime·miniterrno(SB),NOSPLIT,$0 MOVQ AX, (m_mOS+mOS_perrno)(BX) RET -// int64 runtime·nanotime2(void); -// -// clock_gettime(3c) wrapper because Timespec is too large for -// runtime·nanotime stack. -// -// Called using runtime·sysvicall6 from os_solaris.c:/nanotime. -// NOT USING GO CALLING CONVENTION. -TEXT runtime·nanotime2(SB),NOSPLIT,$0 - // need space for the timespec argument. - SUBQ $64, SP // 16 bytes will do, but who knows in the future? - MOVQ $3, DI // CLOCK_REALTIME from <sys/time_impl.h> - MOVQ SP, SI - LEAQ libc_clock_gettime(SB), AX - CALL AX - MOVQ (SP), AX // tv_sec from struct timespec - IMULQ $1000000000, AX // multiply into nanoseconds - ADDQ 8(SP), AX // tv_nsec, offset should be stable. - ADDQ $64, SP - RET - // pipe(3c) wrapper that returns fds in AX, DX. // NOT USING GO CALLING CONVENTION. TEXT runtime·pipe1(SB),NOSPLIT,$0 @@ -338,23 +318,3 @@ TEXT runtime·osyield1(SB),NOSPLIT,$0 LEAQ libc_sched_yield(SB), AX CALL AX RET - -// func walltime1() (sec int64, nsec int32) -TEXT runtime·walltime1(SB),NOSPLIT,$8-12 - CALL runtime·nanotime1(SB) - MOVQ 0(SP), AX - - // generated code for - // func f(x uint64) (uint64, uint64) { return x/1000000000, x%100000000 } - // adapted to reduce duplication - MOVQ AX, CX - MOVQ $1360296554856532783, AX - MULQ CX - ADDQ CX, DX - RCRQ $1, DX - SHRQ $29, DX - MOVQ DX, sec+0(FP) - IMULQ $1000000000, DX - SUBQ DX, CX - MOVL CX, nsec+8(FP) - RET |