d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Don't explicitly check the thread for NULL. That is the caller's

Browse Source 
responsibility.
o If a thread is not joinable, the correct return value is EINVAL.
This commit is contained in:
Mike Makonnen 2004-03-29 13:53:43 +00:00
parent 8c223652fb
commit b321aa9888
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libthr/thread/thr_join.c
View File

@ -47,7 +47,7 @@ _pthread_join(pthread_t pthread, void **thread_return)
_thread_enter_cancellation_point(); _thread_enter_cancellation_point();
/* Check if the caller has specified an invalid thread: */ /* Check if the caller has specified an invalid thread: */
if (pthread == NULL || pthread->magic != PTHREAD_MAGIC) { if (pthread->magic != PTHREAD_MAGIC) {
/* Invalid thread: */ /* Invalid thread: */
_thread_leave_cancellation_point(); _thread_leave_cancellation_point();
return(EINVAL); return(EINVAL);
@ -85,16 +85,20 @@ _pthread_join(pthread_t pthread, void **thread_return)
} }
/* Check if the thread was not found or has been detached: */ /* Check if the thread was not found or has been detached: */
if (thread == NULL || if (thread == NULL) {
((pthread->attr.flags & PTHREAD_DETACHED) != 0)) {
if (thread != NULL)
UMTX_UNLOCK(&pthread->lock);
THREAD_LIST_UNLOCK; THREAD_LIST_UNLOCK;
DEAD_LIST_UNLOCK; DEAD_LIST_UNLOCK;
ret = ESRCH; ret = ESRCH;
goto out; goto out;
} }
if ((pthread->attr.flags & PTHREAD_DETACHED) != 0) {
UMTX_UNLOCK(&pthread->lock);
THREAD_LIST_UNLOCK;
DEAD_LIST_UNLOCK;
ret = EINVAL;
goto out;
}
if (pthread->joiner != NULL) { if (pthread->joiner != NULL) {
/* Multiple joiners are not supported. */ /* Multiple joiners are not supported. */
/* XXXTHR - support multiple joiners. */ /* XXXTHR - support multiple joiners. */