summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Gustedt <Jens.Gustedt@inria.fr>2017-06-24 10:18:05 +0200
committerRich Felker <dalias@aerifal.cx>2017-07-04 17:12:52 -0400
commitd906fa3118c888227d858b6d642a09e055eca2b4 (patch)
tree9448107ecf485b113c32ac676a482c2c8891d08e
parent60ab365cae24063b0f21821860ca16fb63e81f81 (diff)
downloadmusl-d906fa3118c888227d858b6d642a09e055eca2b4.tar.gz
unify the use of FUTEX_PRIVATE
The flag 1<<7 is used in several places for different purposes that are not always easy to distinguish. Mark those usages that correspond to the flag that is used by the kernel for futexes.
-rw-r--r--src/internal/pthread_impl.h2
-rw-r--r--src/thread/__timedwait.c2
-rw-r--r--src/thread/pthread_barrier_wait.c2
-rw-r--r--src/thread/pthread_cond_timedwait.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index ae0ab1c5..56e19348 100644
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -131,7 +131,7 @@ int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int)
void __wait(volatile int *, volatile int *, int, int);
static inline void __wake(volatile void *addr, int cnt, int priv)
{
- if (priv) priv = 128;
+ if (priv) priv = FUTEX_PRIVATE;
if (cnt<0) cnt = INT_MAX;
__syscall(SYS_futex, addr, FUTEX_WAKE|priv, cnt) != -ENOSYS ||
__syscall(SYS_futex, addr, FUTEX_WAKE, cnt);
diff --git a/src/thread/__timedwait.c b/src/thread/__timedwait.c
index 13d8465a..d2079c88 100644
--- a/src/thread/__timedwait.c
+++ b/src/thread/__timedwait.c
@@ -14,7 +14,7 @@ int __timedwait_cp(volatile int *addr, int val,
int r;
struct timespec to, *top=0;
- if (priv) priv = 128;
+ if (priv) priv = FUTEX_PRIVATE;
if (at) {
if (at->tv_nsec >= 1000000000UL) return EINVAL;
diff --git a/src/thread/pthread_barrier_wait.c b/src/thread/pthread_barrier_wait.c
index 06b83db9..cc2a8bbf 100644
--- a/src/thread/pthread_barrier_wait.c
+++ b/src/thread/pthread_barrier_wait.c
@@ -84,7 +84,7 @@ int pthread_barrier_wait(pthread_barrier_t *b)
a_spin();
a_inc(&inst->finished);
while (inst->finished == 1)
- __syscall(SYS_futex,&inst->finished,FUTEX_WAIT|128,1,0) != -ENOSYS
+ __syscall(SYS_futex,&inst->finished,FUTEX_WAIT|FUTEX_PRIVATE,1,0) != -ENOSYS
|| __syscall(SYS_futex,&inst->finished,FUTEX_WAIT,1,0);
return PTHREAD_BARRIER_SERIAL_THREAD;
}
diff --git a/src/thread/pthread_cond_timedwait.c b/src/thread/pthread_cond_timedwait.c
index 3526ecfb..ed8569c2 100644
--- a/src/thread/pthread_cond_timedwait.c
+++ b/src/thread/pthread_cond_timedwait.c
@@ -54,7 +54,7 @@ static inline void unlock_requeue(volatile int *l, volatile int *r, int w)
{
a_store(l, 0);
if (w) __wake(l, 1, 1);
- else __syscall(SYS_futex, l, FUTEX_REQUEUE|128, 0, 1, r) != -ENOSYS
+ else __syscall(SYS_futex, l, FUTEX_REQUEUE|FUTEX_PRIVATE, 0, 1, r) != -ENOSYS
|| __syscall(SYS_futex, l, FUTEX_REQUEUE, 0, 1, r);
}