diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-08-26 16:00:46 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-08-26 16:00:46 +0000 |
commit | 00a2f9aa41a4f2a441c3b9787ca1a7701632de5f (patch) | |
tree | 55ba2c2f0f2e630c24fd23f81029c1dbc7de3058 /linuxthreads/condvar.c | |
parent | 08cac4ac19abd40887afbd9d841cd96a8efbbe98 (diff) | |
download | glibc-00a2f9aa41a4f2a441c3b9787ca1a7701632de5f.zip glibc-00a2f9aa41a4f2a441c3b9787ca1a7701632de5f.tar.gz glibc-00a2f9aa41a4f2a441c3b9787ca1a7701632de5f.tar.bz2 |
Update.
1998-08-26 15:46 Ulrich Drepper <drepper@cygnus.com>
* internals.h: Define THREAD_GETMEM and THREAD_SETMEM to default if
not already defined.
(struct _pthread_descr_struct): Add p_self and p_nr field.
* manager.c (__pthread_handles): Define second element to point
to manager thread.
(__pthread_handles_num): Initialize to 2.
(__pthread_manager): Use INIT_THREAD_SELF with two arguments.
(pthread_start_thread): Likewise.
(pthread_handle_create): Start search for free slot at entry 2.
Initialize new fields p_self and p_nr.
Call __clone with CLONE_PTRACE if available.
(pthread_free): Call FREE_THREAD_SELF if available.
* pthread.c (__pthread_initial_thread): Initialize new fields.
(__pthread_manager_thread): Likewise.
(__pthread_initialize_manager): Call __clone with CLONE_PTRACE.
* cancel.c: Use THREAD_GETMEM and THREAD_SETMEM to access the
elements of the thread descriptor.
* condvar.c: Likewise.
* errno.c: Likewise.
* join.c: Likewise.
* manager.c: Likewise.
* pthread.c: Likewise.
* ptlongjmp.c: Likewise.
* semaphore.c: Likewise.
* signals.c: Likewise.
* specific.c: Likewise.
* spinlock.c: Likewise.
* sysdeps/alpha/pt-machine.h (INIT_THREAD_SELF): Add extra parameter.
* sysdeps/i386/useldt.h: New file.
* sysdeps/i386/i686/pt-machine.h: Show how to use this file.
* sysdeps/sparc/sparc32/pt-machine.h: Define THREAD_GETMEM and
THREAD_SETMEM using __thread_self.
* sysdeps/sparc/sparc64/pt-machine.h: Likewise.
Diffstat (limited to 'linuxthreads/condvar.c')
-rw-r--r-- | linuxthreads/condvar.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c index 480a8e4..773d714 100644 --- a/linuxthreads/condvar.c +++ b/linuxthreads/condvar.c @@ -50,7 +50,8 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) suspend_with_cancellation(self); pthread_mutex_lock(mutex); /* This is a cancellation point */ - if (self->p_canceled && self->p_cancelstate == PTHREAD_CANCEL_ENABLE) { + if (THREAD_GETMEM(self, p_canceled) + && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) { /* Remove ourselves from the waiting queue if we're still on it */ __pthread_lock(&cond->c_lock); remove_from_queue(&cond->c_waiting, self); @@ -77,11 +78,12 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond, pthread_mutex_unlock(mutex); /* Set up a longjmp handler for the restart and cancel signals */ if (sigsetjmp(jmpbuf, 1) == 0) { - self->p_signal_jmp = &jmpbuf; - self->p_cancel_jmp = &jmpbuf; - self->p_signal = 0; + THREAD_SETMEM(self, p_signal_jmp, &jmpbuf); + THREAD_SETMEM(self, p_cancel_jmp, &jmpbuf); + THREAD_SETMEM(self, p_signal, 0); /* Check for cancellation */ - if (self->p_canceled && self->p_cancelstate == PTHREAD_CANCEL_ENABLE) { + if (THREAD_GETMEM(self, p_canceled) + && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) { retsleep = -1; } else { /* Unblock the restart signal */ @@ -96,14 +98,15 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond, } else { retsleep = -1; } - self->p_signal_jmp = NULL; - self->p_cancel_jmp = NULL; + THREAD_SETMEM(self, p_signal_jmp, NULL); + THREAD_SETMEM(self, p_cancel_jmp, NULL); /* Here, either the condition was signaled (self->p_signal != 0) or we got canceled (self->p_canceled != 0) or the timeout occurred (retsleep == 0) or another interrupt occurred (retsleep == -1) */ /* This is a cancellation point */ - if (self->p_canceled && self->p_cancelstate == PTHREAD_CANCEL_ENABLE) { + if (THREAD_GETMEM(self, p_canceled) + && THREAD_GETMEM(self, p_cancelstate) == PTHREAD_CANCEL_ENABLE) { __pthread_lock(&cond->c_lock); remove_from_queue(&cond->c_waiting, self); __pthread_unlock(&cond->c_lock); @@ -111,7 +114,7 @@ pthread_cond_timedwait_relative(pthread_cond_t *cond, pthread_exit(PTHREAD_CANCELED); } /* If not signaled: also remove ourselves and return an error code */ - if (self->p_signal == 0) { + if (THREAD_GETMEM(self, p_signal) == 0) { __pthread_lock(&cond->c_lock); remove_from_queue(&cond->c_waiting, self); __pthread_unlock(&cond->c_lock); |