diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-02-15 09:49:02 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-02-15 09:49:02 +0000 |
| commit | 90491dc4bf7a2c4232565ea68c9bda1383f97ae6 (patch) | |
| tree | d00ccc5fc77334ca06edeaa13afc6a3ad083f047 /nptl/pthread_timedjoin.c | |
| parent | c6247c9d7daab9faa51ae571d4b12a337e9b15ff (diff) | |
| download | glibc-90491dc4bf7a2c4232565ea68c9bda1383f97ae6.tar.gz | |
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_timedjoin.c')
| -rw-r--r-- | nptl/pthread_timedjoin.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c index 7725c52229..dd51fea4aa 100644 --- a/nptl/pthread_timedjoin.c +++ b/nptl/pthread_timedjoin.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -64,7 +64,8 @@ pthread_timedjoin_np (threadid, thread_return, abstime) /* 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; |