diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-07-23 22:10:27 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-07-23 22:10:27 +0000 |
| commit | 1d2230a7d275706c5f0de850e15527aae3744310 (patch) | |
| tree | 55f15700b16f705aa953d5c4051b2e63ca72041a /libpthread/linuxthreads/join.c | |
| parent | 6fa52ec791e030081b7102f50222a13af7fa0d49 (diff) | |
| download | uClibc-alpine-1d2230a7d275706c5f0de850e15527aae3744310.tar.bz2 uClibc-alpine-1d2230a7d275706c5f0de850e15527aae3744310.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libpthread/linuxthreads/join.c')
| -rw-r--r-- | libpthread/linuxthreads/join.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpthread/linuxthreads/join.c b/libpthread/linuxthreads/join.c index f6c0e602c..5aeec6a20 100644 --- a/libpthread/linuxthreads/join.c +++ b/libpthread/linuxthreads/join.c @@ -31,7 +31,7 @@ void pthread_exit(void * retval) pthread_descr self = thread_self(); pthread_descr joining; struct pthread_request request; -PDEBUG("self=%p, pid=%d\n", self, self->p_pid); + PDEBUG("self=%p, pid=%d\n", self, self->p_pid); /* Reset the cancellation flag to avoid looping if the cleanup handlers contain cancellation points */ @@ -67,7 +67,7 @@ PDEBUG("self=%p, pid=%d\n", self, self->p_pid); THREAD_SETMEM(self, p_terminated, 1); /* See if someone is joining on us */ joining = THREAD_GETMEM(self, p_joining); -PDEBUG("joining = %p, pid=%d\n", joining, joining->p_pid); + PDEBUG("joining = %p, pid=%d\n", joining, joining->p_pid); __pthread_unlock(THREAD_GETMEM(self, p_lock)); /* Restart joining thread if any */ if (joining != NULL) restart(joining); @@ -117,7 +117,7 @@ int pthread_join(pthread_t thread_id, void ** thread_return) pthread_descr th; pthread_extricate_if extr; int already_canceled = 0; -PDEBUG("\n"); + PDEBUG("\n"); /* Set up extrication interface */ extr.pu_object = handle; @@ -154,9 +154,9 @@ PDEBUG("\n"); pthread_exit(PTHREAD_CANCELED); } -PDEBUG("before suspend\n"); + PDEBUG("before suspend\n"); suspend(self); -PDEBUG("after suspend\n"); + PDEBUG("after suspend\n"); /* Deregister extrication interface */ __pthread_set_own_extricate_if(self, 0); |