diff options
| author | Mike Appleby <mike@app.leby.org> | 2016-09-28 16:01:27 -0500 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2016-10-01 01:25:21 +0000 |
| commit | 360f2e43b78a3ea119ea8dce9649f7c1227d793b (patch) | |
| tree | 3a9ef335748f095044392a0c883e1504a8c41025 /src/runtime/sys_freebsd_amd64.s | |
| parent | d1f4e0413fd2b5cb78a7b645e802565f202d1926 (diff) | |
| download | go-360f2e43b78a3ea119ea8dce9649f7c1227d793b.tar.gz go-360f2e43b78a3ea119ea8dce9649f7c1227d793b.zip | |
runtime: sleep on CLOCK_MONOTONIC in futexsleep1 on freebsd
In FreeBSD 10.0, the _umtx_op syscall was changed to allow sleeping on
any supported clock, but the default clock was switched from a monotonic
clock to CLOCK_REALTIME.
Prior to 10.0, the __umtx_op_wait* functions ignored the fourth argument
to _umtx_op (uaddr1), expected the fifth argument (uaddr2) to be a
struct timespec pointer, and used a monotonic clock (nanouptime(9)) for
timeout calculations.
Since 10.0, if callers want a clock other than CLOCK_REALTIME, they must
call _umtx_op with uaddr1 set to a value greater than sizeof(struct
timespec), and with uaddr2 as pointer to a struct _umtx_time, rather
than a timespec. Callers can set the _clockid field of the struct
_umtx_time to request the clock they want.
The relevant FreeBSD commit:
https://svnweb.freebsd.org/base?view=revision&revision=232144
Fixes #17168
Change-Id: I3dd7b32b683622b8d7b4a6a8f9eb56401bed6bdf
Reviewed-on: https://go-review.googlesource.com/30154
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/runtime/sys_freebsd_amd64.s')
| -rw-r--r-- | src/runtime/sys_freebsd_amd64.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/sys_freebsd_amd64.s b/src/runtime/sys_freebsd_amd64.s index af68581a4e..c3912f7101 100644 --- a/src/runtime/sys_freebsd_amd64.s +++ b/src/runtime/sys_freebsd_amd64.s @@ -14,8 +14,8 @@ TEXT runtime·sys_umtx_op(SB),NOSPLIT,$0 MOVQ addr+0(FP), DI MOVL mode+8(FP), SI MOVL val+12(FP), DX - MOVQ ptr2+16(FP), R10 - MOVQ ts+24(FP), R8 + MOVQ uaddr1+16(FP), R10 + MOVQ ut+24(FP), R8 MOVL $454, AX SYSCALL MOVL AX, ret+32(FP) |