X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fpthread_detach.c;h=77772af2c6349fca2cd66860c71e910c3138b101;hb=0b0640219338b80cf47026d1970b5503414ed7f3;hp=4e45463489153a1ffdbae4858268a1d204356513;hpb=df7d0dfb9c686df31149d09008ba92834bed9803;p=musl

diff --git a/src/thread/pthread_detach.c b/src/thread/pthread_detach.c
index 4e454634..77772af2 100644
--- a/src/thread/pthread_detach.c
+++ b/src/thread/pthread_detach.c
@@ -1,15 +1,14 @@
 #include "pthread_impl.h"
+#include <threads.h>
 
-int __pthread_join(pthread_t, void **);
-
-int __pthread_detach(pthread_t t)
+static int __pthread_detach(pthread_t t)
 {
-	/* Cannot detach a thread that's already exiting */
-	if (a_swap(t->exitlock, 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;
 }
 
 weak_alias(__pthread_detach, pthread_detach);
+weak_alias(__pthread_detach, thrd_detach);