generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: I70266ee8c520b216773f267e46c8273d2334c31d
This commit is contained in:
The Android Open Source Project
2010-03-22 15:55:09 -07:00
parent 709a898de8 1825fb5d5f
commit 377d4c979d
27 changed files with 189 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libc/bionic/pthread.c
View File

@@ -601,13 +601,12 @@ int pthread_join(pthread_t thid, void ** ret_val)
for (thread = gThreadList; thread != NULL; thread = thread->next)
if (thread == (pthread_internal_t*)thid)
break;
goto FoundIt;
if (!thread) {
pthread_mutex_unlock(&gThreadListLock);
return ESRCH;
}
pthread_mutex_unlock(&gThreadListLock);
return ESRCH;
FoundIt:
if (thread->attr.flags & PTHREAD_ATTR_FLAG_DETACHED) {
pthread_mutex_unlock(&gThreadListLock);
return EINVAL;