diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 02:09:04 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-06-05 02:09:04 +0400 |
| commit | 415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da (patch) | |
| tree | f7773ad82023c8616b339d84faa4bb7643af0311 /nptl/pthread_tryjoin.c | |
| parent | 3cc0cd4c5b3bed6f7d9aff26322d505785e11aa9 (diff) | |
| download | glibc-415ee7d6e47dcb3e0906a7bebc6d52ab8ed899da.tar.gz | |
Merged changes from kopensolaris-gnu project
http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu/glibc.git
Commits from 9157319 to bad8ac8.
This is only partial patch, some changes to not apply
and will be resovled and committed next.
Diffstat (limited to 'nptl/pthread_tryjoin.c')
| -rw-r--r-- | nptl/pthread_tryjoin.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/nptl/pthread_tryjoin.c b/nptl/pthread_tryjoin.c index 7b3ad2bc74..0383ffd224 100644 --- a/nptl/pthread_tryjoin.c +++ b/nptl/pthread_tryjoin.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2005, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -20,7 +20,7 @@ #include <stdlib.h> #include <atomic.h> -#include "pthreadP.h" +#include <pthreadP.h> int @@ -29,10 +29,18 @@ pthread_tryjoin_np (threadid, thread_return) void **thread_return; { struct pthread *self; +#ifndef PTHREAD_T_IS_TID struct pthread *pd = (struct pthread *) threadid; +#else + struct pthread *pd = __find_in_stack_list (threadid); +#endif /* Make sure the descriptor is valid. */ +#ifndef PTHREAD_T_IS_TID if (DEBUGGING_P && __find_in_stack_list (pd) == NULL) +#else + if ((pd) == NULL) +#endif /* Not a valid thread handle. */ return ESRCH; @@ -53,7 +61,11 @@ pthread_tryjoin_np (threadid, thread_return) return EDEADLK; /* Return right away if the thread hasn't terminated yet. */ +#ifndef lll_tryjoin if (pd->tid != 0) +#else + if (lll_tryjoin (pd->tid) != 0) +#endif return EBUSY; /* Wait for the thread to finish. If it is already locked something |