X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fthread%2Fpthread_detach.c;h=77772af2c6349fca2cd66860c71e910c3138b101;hb=bf14ef193b4203aa9a8b173faeeea06d98397f65;hp=692bbaf9cb643d111c69dc52ac8f5acda2eb89d5;hpb=c4bc0b1a64e1ef1e105df84401805a16e8dbe82a;p=musl

diff --git a/src/thread/pthread_detach.c b/src/thread/pthread_detach.c
index 692bbaf9..77772af2 100644
--- a/src/thread/pthread_detach.c
+++ b/src/thread/pthread_detach.c
@@ -1,15 +1,12 @@
 #include "pthread_impl.h"
 #include <threads.h>
 
-int __pthread_join(pthread_t, void **);
-
 static int __pthread_detach(pthread_t t)
 {
-	/* Cannot detach a thread that's already exiting */
-	if (a_cas(t->exitlock, 0, INT_MIN + 1))
+	/* 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);
-	t->detached = 2;
-	UNLOCK(t->exitlock);
 	return 0;
 }