diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-12-13 10:37:24 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-12-16 01:58:33 +0100 |
| commit | bec412424e949c900b01767ce32b6743bdaaac93 (patch) | |
| tree | d4244ee3b644f5e8e68dfb5f22aeeb30065bca75 /hurd/hurdlock.c | |
| parent | 18c2ab9a094f6a6cb3a107d66dafaf32f8f969f0 (diff) | |
| download | glibc-bec412424e949c900b01767ce32b6743bdaaac93.tar glibc-bec412424e949c900b01767ce32b6743bdaaac93.tar.gz glibc-bec412424e949c900b01767ce32b6743bdaaac93.tar.bz2 glibc-bec412424e949c900b01767ce32b6743bdaaac93.zip | |
hurd: make lll_* take a variable instead of a ptr
To be coherent with other ports, let's make lll_* take a variable, and
rename those that keep taking a ptr into __lll_*.
Diffstat (limited to 'hurd/hurdlock.c')
| -rw-r--r-- | hurd/hurdlock.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hurd/hurdlock.c b/hurd/hurdlock.c index 59d017fc02..3b9974bee5 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)) |