diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-12-16 04:54:52 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-12-16 04:54:52 +0000 |
| commit | 7dfaf230d2191da71f3078943ea09d014298e7b0 (patch) | |
| tree | 11b16e846adf904f804b8ce15937db12d08259d8 /libpthread/linuxthreads.old/condvar.c | |
| parent | 1bcf527f5f8c94aac1b2e80b585898a7266293af (diff) | |
| download | uClibc-alpine-7dfaf230d2191da71f3078943ea09d014298e7b0.tar.bz2 uClibc-alpine-7dfaf230d2191da71f3078943ea09d014298e7b0.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads.old/condvar.c')
| -rw-r--r-- | libpthread/linuxthreads.old/condvar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpthread/linuxthreads.old/condvar.c b/libpthread/linuxthreads.old/condvar.c index 62df907c1..3d77f781a 100644 --- a/libpthread/linuxthreads.old/condvar.c +++ b/libpthread/linuxthreads.old/condvar.c @@ -93,7 +93,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) if (already_canceled) { __pthread_set_own_extricate_if(self, 0); - pthread_exit(PTHREAD_CANCELED); + __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); } __pthread_mutex_unlock(mutex); @@ -122,7 +122,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) { THREAD_SETMEM(self, p_woken_by_cancel, 0); __pthread_mutex_lock(mutex); - pthread_exit(PTHREAD_CANCELED); + __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); } /* Put back any resumes we caught that don't belong to us. */ @@ -168,7 +168,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond, if (already_canceled) { __pthread_set_own_extricate_if(self, 0); - pthread_exit(PTHREAD_CANCELED); + __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); } __pthread_mutex_unlock(mutex); @@ -216,7 +216,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond, && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) { THREAD_SETMEM(self, p_woken_by_cancel, 0); __pthread_mutex_lock(mutex); - pthread_exit(PTHREAD_CANCELED); + __pthread_do_exit(PTHREAD_CANCELED, CURRENT_STACK_FRAME); } /* Put back any resumes we caught that don't belong to us. */ |