diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-03-11 23:26:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-03-11 23:26:35 +0000 |
| commit | 32a589b1ea1365c8651b0692d0350403fde7b6ff (patch) | |
| tree | 77b94275bcf321370496c19d29267e8c66a8606d /nptl/sysdeps/pthread/pthread_cond_wait.c | |
| parent | 3e976b962a84255b70bcf6d9751a9a35d3e987ab (diff) | |
| download | glibc-32a589b1ea1365c8651b0692d0350403fde7b6ff.tar glibc-32a589b1ea1365c8651b0692d0350403fde7b6ff.tar.gz glibc-32a589b1ea1365c8651b0692d0350403fde7b6ff.tar.bz2 glibc-32a589b1ea1365c8651b0692d0350403fde7b6ff.zip | |
Update.
* cancellation.c (__pthread_enable_asynccancel_2): New function.
* pthreadP.h: Declare __pthread_enable_asynccancel_2.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
(__pthread_cond_timedwait): Use __pthread_enable_asynccancel_2
instead of __pthread_enable_asynccancel.
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
(__pthread_cond_wait): Likewise.
* sysdeps/pthread/pthread_cond_timedwait.c
(__pthread_cond_timedwait): Likewise.
* sysdeps/pthread/pthread_cond_wait.c (__pthread_cond_wait): Likewise.
Diffstat (limited to 'nptl/sysdeps/pthread/pthread_cond_wait.c')
| -rw-r--r-- | nptl/sysdeps/pthread/pthread_cond_wait.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nptl/sysdeps/pthread/pthread_cond_wait.c b/nptl/sysdeps/pthread/pthread_cond_wait.c index 78fcc7f6c6..b681ef26fd 100644 --- a/nptl/sysdeps/pthread/pthread_cond_wait.c +++ b/nptl/sysdeps/pthread/pthread_cond_wait.c @@ -123,7 +123,7 @@ __pthread_cond_wait (cond, mutex) lll_mutex_unlock (cond->__data.__lock); /* Enable asynchronous cancellation. Required by the standard. */ - cbuffer.oldtype = __pthread_enable_asynccancel (); + __pthread_enable_asynccancel_2 (&cbuffer.oldtype); /* Wait until woken by signal or broadcast. Note that we truncate the 'val' value to 32 bits. */ @@ -133,7 +133,7 @@ __pthread_cond_wait (cond, mutex) __pthread_disable_asynccancel (cbuffer.oldtype); /* We are going to look at shared data again, so get the lock. */ - lll_mutex_lock(cond->__data.__lock); + lll_mutex_lock (cond->__data.__lock); /* Check whether we are eligible for wakeup. */ val = cond->__data.__wakeup_seq; |