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/semaphore.c | |
| parent | 08cac4ac19abd40887afbd9d841cd96a8efbbe98 (diff) | |
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/semaphore.c')
| -rw-r--r-- | linuxthreads/semaphore.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linuxthreads/semaphore.c b/linuxthreads/semaphore.c index 6f79dc0138..af5f115a16 100644 --- a/linuxthreads/semaphore.c +++ b/linuxthreads/semaphore.c @@ -54,7 +54,8 @@ int sem_wait(sem_t * sem) __pthread_unlock((struct _pthread_fastlock *) &sem->sem_lock); suspend_with_cancellation(self); /* 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 list if we're still on it */ __pthread_lock((struct _pthread_fastlock *) &sem->sem_lock); remove_from_queue(&sem->sem_waiting, self); @@ -86,7 +87,7 @@ int sem_post(sem_t * sem) pthread_descr th; struct pthread_request request; - if (self->p_in_sighandler == NULL) { + if (THREAD_GETMEM(self, p_in_sighandler) == NULL) { __pthread_lock((struct _pthread_fastlock *) &sem->sem_lock); if (sem->sem_waiting == NULL) { if (sem->sem_value >= SEM_VALUE_MAX) { |