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

Unwind the _giant_mutex from pthread_detach(). When detaching a joiner thread

Browse Source 
it's important the correct lock order is observed: lock first the joined and
then the joiner.
This commit is contained in:
Mike Makonnen 2003-06-02 11:01:00 +00:00
parent 4384412030
commit cff6c3cab1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,20 +44,19 @@ _pthread_detach(pthread_t pthread)
if (pthread == NULL || pthread->magic != PTHREAD_MAGIC)
return (EINVAL);
if (pthread->attr.flags & PTHREAD_DETACHED)
_SPINLOCK(&pthread->lock);
if (pthread->attr.flags & PTHREAD_DETACHED) {
_SPINUNLOCK(&pthread->lock);
return (EINVAL);
}
pthread->attr.flags |= PTHREAD_DETACHED;
/*
* Defer signals to protect the scheduling queues from
* access by the signal handler:
*/
GIANT_LOCK(curthread);
/* Check if there is a joiner: */
if (pthread->joiner != NULL) {
struct pthread *joiner = pthread->joiner;
_thread_critical_enter(joiner);
/* Make the thread runnable: */
PTHREAD_NEW_STATE(joiner, PS_RUNNING);
@ -71,9 +70,10 @@ _pthread_detach(pthread_t pthread)
* Disconnect the joiner from the thread being detached:
*/
pthread->joiner = NULL;
_thread_critical_exit(joiner);
}
GIANT_UNLOCK(curthread);
_SPINUNLOCK(&pthread->lock);
return (0);
}