diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-10-29 15:17:25 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-10-29 15:17:25 +0000 |
| commit | c5e340c71ba6f4563ca5fa245baa82b6363ddb2e (patch) | |
| tree | 3ff655dfee624df411e1f3ebc062181fc0f3f338 /linuxthreads/join.c | |
| parent | 05e951cd1ae7917ce25ec96cc17ebcbf401e345c (diff) | |
| download | glibc-c5e340c71ba6f4563ca5fa245baa82b6363ddb2e.tar.gz glibc-c5e340c71ba6f4563ca5fa245baa82b6363ddb2e.tar.xz glibc-c5e340c71ba6f4563ca5fa245baa82b6363ddb2e.zip | |
Update.
1998-10-29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/ttyname_r.c (ttyname_r): Try reading /prof/self/fd/FD first. * sysdeps/unix/sysv/linux/ttyname.c (ttyname): Likewise. * stdio-common/_itoa.h (_fitoa_word): New inline function. Write formatted number starting at given position and return pointer to following byte. (_fitoa): Likewise, for long long.
Diffstat (limited to 'linuxthreads/join.c')
| -rw-r--r-- | linuxthreads/join.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linuxthreads/join.c b/linuxthreads/join.c index 482f0d1dcc..42eb033746 100644 --- a/linuxthreads/join.c +++ b/linuxthreads/join.c @@ -35,7 +35,7 @@ void pthread_exit(void * retval) __pthread_perform_cleanup(); __pthread_destroy_specifics(); /* Store return value */ - __pthread_lock(THREAD_GETMEM(self, p_lock)); + __pthread_lock(THREAD_GETMEM(self, p_lock), self); THREAD_SETMEM(self, p_retval, retval); /* Say that we've terminated */ THREAD_SETMEM(self, p_terminated, 1); @@ -65,7 +65,7 @@ int pthread_join(pthread_t thread_id, void ** thread_return) pthread_handle handle = thread_handle(thread_id); pthread_descr th; - __pthread_lock(&handle->h_lock); + __pthread_lock(&handle->h_lock, self); if (invalid_handle(handle, thread_id)) { __pthread_unlock(&handle->h_lock); return ESRCH; @@ -91,7 +91,7 @@ int pthread_join(pthread_t thread_id, void ** thread_return) th->p_joining = NULL; pthread_exit(PTHREAD_CANCELED); } - __pthread_lock(&handle->h_lock); + __pthread_lock(&handle->h_lock, self); } /* Get return value */ if (thread_return != NULL) *thread_return = th->p_retval; @@ -114,7 +114,7 @@ int pthread_detach(pthread_t thread_id) pthread_handle handle = thread_handle(thread_id); pthread_descr th; - __pthread_lock(&handle->h_lock); + __pthread_lock(&handle->h_lock, NULL); if (invalid_handle(handle, thread_id)) { __pthread_unlock(&handle->h_lock); return ESRCH; |