diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/hurdlock.c | 14 | ||||
| -rw-r--r-- | hurd/hurdlock.h | 38 | ||||
| -rw-r--r-- | hurd/hurdpid.c | 2 |
3 files changed, 30 insertions, 24 deletions
diff --git a/hurd/hurdlock.c b/hurd/hurdlock.c index 59d017f..3b9974b 100644 --- a/hurd/hurdlock.c +++ b/hurd/hurdlock.c @@ -51,7 +51,7 @@ __lll_abstimed_wait (void *ptr, int val, return EINVAL; int mlsec = compute_reltime (tsp, clk); - return mlsec < 0 ? KERN_TIMEDOUT : lll_timed_wait (ptr, val, mlsec, flags); + return mlsec < 0 ? KERN_TIMEDOUT : __lll_timed_wait (ptr, val, mlsec, flags); } int @@ -62,7 +62,7 @@ __lll_abstimed_xwait (void *ptr, int lo, int hi, return EINVAL; int mlsec = compute_reltime (tsp, clk); - return mlsec < 0 ? KERN_TIMEDOUT : lll_timed_xwait (ptr, lo, hi, mlsec, + return mlsec < 0 ? KERN_TIMEDOUT : __lll_timed_xwait (ptr, lo, hi, mlsec, flags); } @@ -73,7 +73,7 @@ __lll_abstimed_lock (void *ptr, if (clk != CLOCK_REALTIME) return EINVAL; - if (lll_trylock (ptr) == 0) + if (__lll_trylock (ptr) == 0) return 0; while (1) @@ -84,7 +84,7 @@ __lll_abstimed_lock (void *ptr, return EINVAL; int mlsec = compute_reltime (tsp, clk); - if (mlsec < 0 || lll_timed_wait (ptr, 2, mlsec, flags) == KERN_TIMEDOUT) + if (mlsec < 0 || __lll_timed_wait (ptr, 2, mlsec, flags) == KERN_TIMEDOUT) return ETIMEDOUT; } } @@ -140,7 +140,7 @@ __lll_robust_lock (void *ptr, int flags) } else { - lll_timed_wait (iptr, val, wait_time, flags); + __lll_timed_wait (iptr, val, wait_time, flags); if (wait_time < MAX_WAIT_TIME) wait_time <<= 1; } @@ -187,7 +187,7 @@ __lll_robust_abstimed_lock (void *ptr, else if (mlsec > wait_time) mlsec = wait_time; - int res = lll_timed_wait (iptr, val, mlsec, flags); + int res = __lll_timed_wait (iptr, val, mlsec, flags); if (res == KERN_TIMEDOUT) return ETIMEDOUT; else if (wait_time < MAX_WAIT_TIME) @@ -223,7 +223,7 @@ __lll_robust_unlock (void *ptr, int flags) { if (val & LLL_WAITERS) { - lll_set_wake (ptr, 0, flags); + __lll_set_wake (ptr, 0, flags); break; } else if (atomic_compare_exchange_weak_release ((unsigned int *)ptr, &val, 0)) diff --git a/hurd/hurdlock.h b/hurd/hurdlock.h index 362bcf6..c1df42b 100644 --- a/hurd/hurdlock.h +++ b/hurd/hurdlock.h @@ -31,21 +31,21 @@ struct timespec; /* Wait on 64-bit address PTR, without blocking if its contents are different from the pair <LO, HI>. */ -#define lll_xwait(ptr, lo, hi, flags) \ +#define __lll_xwait(ptr, lo, hi, flags) \ __gsync_wait (__mach_task_self (), \ (vm_offset_t)ptr, lo, hi, 0, flags | GSYNC_QUAD) -/* Same as 'lll_wait', but only block for MLSEC milliseconds. */ -#define lll_timed_wait(ptr, val, mlsec, flags) \ +/* Same as '__lll_wait', but only block for MLSEC milliseconds. */ +#define __lll_timed_wait(ptr, val, mlsec, flags) \ __gsync_wait (__mach_task_self (), \ (vm_offset_t)ptr, val, 0, mlsec, flags | GSYNC_TIMED) -/* Same as 'lll_xwait', but only block for MLSEC milliseconds. */ -#define lll_timed_xwait(ptr, lo, hi, mlsec, flags) \ +/* Same as '__lll_xwait', but only block for MLSEC milliseconds. */ +#define __lll_timed_xwait(ptr, lo, hi, mlsec, flags) \ __gsync_wait (__mach_task_self (), (vm_offset_t)ptr, \ lo, hi, mlsec, flags | GSYNC_TIMED | GSYNC_QUAD) -/* Same as 'lll_wait', but only block until TSP elapses, +/* Same as '__lll_wait', but only block until TSP elapses, using clock CLK. */ extern int __lll_abstimed_wait (void *__ptr, int __val, const struct timespec *__tsp, int __flags, int __clk); @@ -63,6 +63,8 @@ extern int __lll_abstimed_lock (void *__ptr, /* Acquire the lock at PTR, but return with an error if the process containing the owner thread dies. */ extern int __lll_robust_lock (void *__ptr, int __flags); +#define lll_robust_lock(var, flags) \ + __lll_robust_lock (&(var), flags) /* Same as '__lll_robust_lock', but only block until TSP elapses, using clock CLK. */ @@ -72,19 +74,23 @@ extern int __lll_robust_abstimed_lock (void *__ptr, /* Same as '__lll_robust_lock', but return with an error if the lock cannot be acquired without blocking. */ extern int __lll_robust_trylock (void *__ptr); +#define lll_robust_trylock(var) \ + __lll_robust_trylock (&(var)) /* Wake one or more threads waiting on address PTR, setting its value to VAL before doing so. */ -#define lll_set_wake(ptr, val, flags) \ +#define __lll_set_wake(ptr, val, flags) \ __gsync_wake (__mach_task_self (), \ (vm_offset_t)ptr, val, flags | GSYNC_MUTATE) /* Release the robust lock at PTR. */ extern void __lll_robust_unlock (void *__ptr, int __flags); +#define lll_robust_unlock(var, flags) \ + __lll_robust_unlock (&(var), flags) /* Rearrange threads waiting on address SRC to instead wait on DST, waking one of them if WAIT_ONE is non-zero. */ -#define lll_requeue(src, dst, wake_one, flags) \ +#define __lll_requeue(src, dst, wake_one, flags) \ __gsync_requeue (__mach_task_self (), (vm_offset_t)src, \ (vm_offset_t)dst, (boolean_t)wake_one, flags) @@ -93,31 +99,31 @@ extern void __lll_robust_unlock (void *__ptr, int __flags); every one of these calls, defaulting to CLOCK_REALTIME if no argument is passed. */ -#define lll_abstimed_wait(ptr, val, tsp, flags, ...) \ +#define lll_abstimed_wait(var, val, tsp, flags, ...) \ ({ \ const clockid_t __clk[] = { CLOCK_REALTIME, ##__VA_ARGS__ }; \ - __lll_abstimed_wait ((ptr), (val), (tsp), (flags), \ + __lll_abstimed_wait (&(var), (val), (tsp), (flags), \ __clk[sizeof (__clk) / sizeof (__clk[0]) - 1]); \ }) -#define lll_abstimed_xwait(ptr, lo, hi, tsp, flags, ...) \ +#define lll_abstimed_xwait(var, lo, hi, tsp, flags, ...) \ ({ \ const clockid_t __clk[] = { CLOCK_REALTIME, ##__VA_ARGS__ }; \ - __lll_abstimed_xwait ((ptr), (lo), (hi), (tsp), (flags), \ + __lll_abstimed_xwait (&(var), (lo), (hi), (tsp), (flags), \ __clk[sizeof (__clk) / sizeof (__clk[0]) - 1]); \ }) -#define lll_abstimed_lock(ptr, tsp, flags, ...) \ +#define lll_abstimed_lock(var, tsp, flags, ...) \ ({ \ const clockid_t __clk[] = { CLOCK_REALTIME, ##__VA_ARGS__ }; \ - __lll_abstimed_lock ((ptr), (tsp), (flags), \ + __lll_abstimed_lock (&(var), (tsp), (flags), \ __clk[sizeof (__clk) / sizeof (__clk[0]) - 1]); \ }) -#define lll_robust_abstimed_lock(ptr, tsp, flags, ...) \ +#define lll_robust_abstimed_lock(var, tsp, flags, ...) \ ({ \ const clockid_t __clk[] = { CLOCK_REALTIME, ##__VA_ARGS__ }; \ - __lll_robust_abstimed_lock ((ptr), (tsp), (flags), \ + __lll_robust_abstimed_lock (&(var), (tsp), (flags), \ __clk[sizeof (__clk) / sizeof (__clk[0]) - 1]); \ }) diff --git a/hurd/hurdpid.c b/hurd/hurdpid.c index dd8281c..5607570 100644 --- a/hurd/hurdpid.c +++ b/hurd/hurdpid.c @@ -66,7 +66,7 @@ _S_msg_proc_newids (mach_port_t me, /* Notify any waiting user threads that the id change as been completed. */ ++_hurd_pids_changed_stamp; - lll_wake (&_hurd_pids_changed_stamp, GSYNC_BROADCAST); + lll_wake (_hurd_pids_changed_stamp, GSYNC_BROADCAST); return 0; } |