diff options
Diffstat (limited to 'nptl/pthread_tryjoin.c')
-rw-r--r-- | nptl/pthread_tryjoin.c | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/nptl/pthread_tryjoin.c b/nptl/pthread_tryjoin.c index 6a3b62e409..b34df54970 100644 --- a/nptl/pthread_tryjoin.c +++ b/nptl/pthread_tryjoin.c @@ -16,57 +16,17 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <errno.h> -#include <stdlib.h> - -#include <atomic.h> #include "pthreadP.h" - int pthread_tryjoin_np (pthread_t threadid, void **thread_return) { - struct pthread *self; - struct pthread *pd = (struct pthread *) threadid; - - /* Make sure the descriptor is valid. */ - if (DEBUGGING_P && __find_in_stack_list (pd) == NULL) - /* Not a valid thread handle. */ - return ESRCH; - - /* Is the thread joinable?. */ - if (IS_DETACHED (pd)) - /* We cannot wait for the thread. */ - return EINVAL; - - self = THREAD_SELF; - if (pd == self || self->joinid == pd) - /* This is a deadlock situation. The threads are waiting for each - other to finish. Note that this is a "may" error. To be 100% - sure we catch this error we would have to lock the data - structures but it is not necessary. In the unlikely case that - two threads are really caught in this situation they will - deadlock. It is the programmer's problem to figure this - out. */ - return EDEADLK; - /* Return right away if the thread hasn't terminated yet. */ + struct pthread *pd = (struct pthread *) threadid; if (pd->tid != 0) return EBUSY; - /* 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_bool_acq (&pd->joinid, self, NULL)) - /* There is already somebody waiting for the thread. */ - return EINVAL; - - /* Store the return value if the caller is interested. */ - if (thread_return != NULL) - *thread_return = pd->result; - - - /* Free the TCB. */ - __free_tcb (pd); - - return 0; + /* If pd->tid != 0 then lll_wait_tid will not block on futex + operation. */ + return __pthread_timedjoin_ex (threadid, thread_return, NULL, false); } |