diff options
author | Jakub Jelinek <jakub@redhat.com> | 2007-08-14 07:38:41 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2007-08-14 07:38:41 +0000 |
commit | c67c02731b6507c5351bca70451441d9a26113ef (patch) | |
tree | afe8d99e55401fe7955475ab97a497cae2e23ab2 /nptl/pthread_cond_signal.c | |
parent | 39762d6a5c0e378f20b28da7450868bfef588fb0 (diff) |
Updated to fedora-glibc-20070814T0725cvs/fedora-glibc-2_6_90-9
Diffstat (limited to 'nptl/pthread_cond_signal.c')
-rw-r--r-- | nptl/pthread_cond_signal.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nptl/pthread_cond_signal.c b/nptl/pthread_cond_signal.c index f2de58fa1d..023bbb5e9b 100644 --- a/nptl/pthread_cond_signal.c +++ b/nptl/pthread_cond_signal.c @@ -32,8 +32,11 @@ int __pthread_cond_signal (cond) pthread_cond_t *cond; { + int pshared = (cond->__data.__mutex == (void *) ~0l) + ? LLL_SHARED : LLL_PRIVATE; + /* Make sure we are alone. */ - lll_lock (cond->__data.__lock, /* XYZ */ LLL_SHARED); + lll_lock (cond->__data.__lock, pshared); /* Are there any waiters to be woken? */ if (cond->__data.__total_seq > cond->__data.__wakeup_seq) @@ -45,18 +48,14 @@ __pthread_cond_signal (cond) /* Wake one. */ if (! __builtin_expect (lll_futex_wake_unlock (&cond->__data.__futex, 1, 1, &cond->__data.__lock, - // XYZ check mutex flag - LLL_SHARED), - 0)) + pshared), 0)) return 0; - lll_futex_wake (&cond->__data.__futex, 1, - // XYZ check mutex flag - LLL_SHARED); + lll_futex_wake (&cond->__data.__futex, 1, pshared); } /* We are done. */ - lll_unlock (cond->__data.__lock, /* XYZ */ LLL_SHARED); + lll_unlock (cond->__data.__lock, pshared); return 0; } |