about summary refs log tree commit diff
path: root/nptl/pthread_join.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-02-15 09:49:02 +0000
committerUlrich Drepper <drepper@redhat.com>2003-02-15 09:49:02 +0000
commit90491dc4bf7a2c4232565ea68c9bda1383f97ae6 (patch)
treed00ccc5fc77334ca06edeaa13afc6a3ad083f047 /nptl/pthread_join.c
parentc6247c9d7daab9faa51ae571d4b12a337e9b15ff (diff)
downloadglibc-90491dc4bf7a2c4232565ea68c9bda1383f97ae6.tar.gz
glibc-90491dc4bf7a2c4232565ea68c9bda1383f97ae6.tar.xz
glibc-90491dc4bf7a2c4232565ea68c9bda1383f97ae6.zip
Update.
	* pthreadP.h: Mark declarations of __find_in_stack_list, __free_tcb,
	and __deallocate_stack with internal_function.
	* pthread_create.c: Adjust definitions appropriately.
	* allocatestack.c: Likewise.

	* pthread_join.c: Add one more __builtin_expect.
	* pthread_timedjoin.c: Likewise.

	* pthread_getspecific.c (__pthread_getspecific): Clear data->data
	not data of sequence number does not match.
	Add one __builtin_expect.
Diffstat (limited to 'nptl/pthread_join.c')
-rw-r--r--nptl/pthread_join.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c
index 5954af778d..387f230576 100644
--- a/nptl/pthread_join.c
+++ b/nptl/pthread_join.c
@@ -66,7 +66,8 @@ pthread_join (threadid, thread_return)
 
   /* Wait for the thread to finish.  If it is already locked something
      is wrong.  There can only be one waiter.  */
-  if (atomic_compare_and_exchange_acq (&pd->joinid, self, NULL) != 0)
+  if (__builtin_expect (atomic_compare_and_exchange_acq (&pd->joinid, self,
+							 NULL) != 0, 0))
     /* There is already somebody waiting for the thread.  */
     return EINVAL;