From bbb0432a33787f1a627abb396fe343a7943ac7bc Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Thu, 19 Mar 2015 15:19:25 -0700 Subject: [PATCH] Return EINVAL when calling pthread_detach for joined thread. Change-Id: I717015132187e087e0ad485284a13c8801e25e77 --- libc/bionic/pthread_detach.cpp | 2 +- tests/pthread_test.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libc/bionic/pthread_detach.cpp b/libc/bionic/pthread_detach.cpp index 9f957f496..dcdb7b135 100644 --- a/libc/bionic/pthread_detach.cpp +++ b/libc/bionic/pthread_detach.cpp @@ -44,7 +44,7 @@ int pthread_detach(pthread_t t) { } switch (old_state) { case THREAD_NOT_JOINED: return 0; - case THREAD_JOINED: return 0; // Already being joined; silently do nothing, like glibc. + case THREAD_JOINED: return EINVAL; case THREAD_DETACHED: return EINVAL; case THREAD_EXITED_NOT_JOINED: break; // Call pthread_join out of scope of pthread_accessor. } diff --git a/tests/pthread_test.cpp b/tests/pthread_test.cpp index de60f2867..251a230e9 100644 --- a/tests/pthread_test.cpp +++ b/tests/pthread_test.cpp @@ -271,8 +271,11 @@ TEST(pthread, pthread_no_op_detach_after_join) { sleep(1); // (Give t2 a chance to call pthread_join.) - // ...a call to pthread_detach on thread 1 will "succeed" (silently fail)... +#if defined(__BIONIC__) + ASSERT_EQ(EINVAL, pthread_detach(t1)); +#else ASSERT_EQ(0, pthread_detach(t1)); +#endif AssertDetached(t1, false); spinhelper.UnSpin();