|
@@ -5,8 +5,12 @@ static int __pthread_detach(pthread_t t)
|
|
|
{
|
|
|
/* If the cas fails, detach state is either already-detached
|
|
|
* or exiting/exited, and pthread_join will trap or cleanup. */
|
|
|
- if (a_cas(&t->detach_state, DT_JOINABLE, DT_DETACHED) != DT_JOINABLE)
|
|
|
- return __pthread_join(t, 0);
|
|
|
+ if (a_cas(&t->detach_state, DT_JOINABLE, DT_DETACHED) != DT_JOINABLE) {
|
|
|
+ int cs;
|
|
|
+ __pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
|
|
|
+ __pthread_join(t, 0);
|
|
|
+ __pthread_setcancelstate(cs, 0);
|
|
|
+ }
|
|
|
return 0;
|
|
|
}
|
|
|
|