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/join.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/join.c')
| -rw-r--r-- | linuxthreads/join.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/linuxthreads/join.c b/linuxthreads/join.c index 4fadd85299..482f0d1dcc 100644 --- a/linuxthreads/join.c +++ b/linuxthreads/join.c @@ -30,18 +30,18 @@ void pthread_exit(void * retval) /* Reset the cancellation flag to avoid looping if the cleanup handlers contain cancellation points */ - self->p_canceled = 0; + THREAD_SETMEM(self, p_canceled, 0); /* Call cleanup functions and destroy the thread-specific data */ __pthread_perform_cleanup(); __pthread_destroy_specifics(); /* Store return value */ - __pthread_lock(self->p_lock); - self->p_retval = retval; + __pthread_lock(THREAD_GETMEM(self, p_lock)); + THREAD_SETMEM(self, p_retval, retval); /* Say that we've terminated */ - self->p_terminated = 1; + THREAD_SETMEM(self, p_terminated, 1); /* See if someone is joining on us */ - joining = self->p_joining; - __pthread_unlock(self->p_lock); + joining = THREAD_GETMEM(self, p_joining); + __pthread_unlock(THREAD_GETMEM(self, p_lock)); /* Restart joining thread if any */ if (joining != NULL) restart(joining); /* If this is the initial thread, block until all threads have terminated. @@ -86,7 +86,8 @@ int pthread_join(pthread_t thread_id, void ** thread_return) __pthread_unlock(&handle->h_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) { th->p_joining = NULL; pthread_exit(PTHREAD_CANCELED); } |