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

am 5f787190: am 4d36b0bd: Merge "Fix the pthread_join on self error case."

Browse Source 
* commit '5f787190a9e7a749d95f566f920b78eafcd05050':
  Fix the pthread_join on self error case.
This commit is contained in:
Elliott Hughes
2012-10-30 10:11:43 -07:00
committed by Android Git Automerger
parent 5e805afa79 5f787190a9
commit 7d617d0db9
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libc/bionic/pthread.c
View File

@@ -633,14 +633,18 @@ void pthread_exit(void * retval)
int pthread_join(pthread_t thid, void ** ret_val)
{
pthread_internal_t* thread = (pthread_internal_t*)thid;
int count;
if (thid == pthread_self()) {
return EDEADLK;
}
// check that the thread still exists and is not detached
pthread_mutex_lock(&gThreadListLock);
for (thread = gThreadList; thread != NULL; thread = thread->next)
if (thread == (pthread_internal_t*)thid)
for (thread = gThreadList; thread != NULL; thread = thread->next) {
if (thread == (pthread_internal_t*)thid) {
goto FoundIt;
}
}
pthread_mutex_unlock(&gThreadListLock);
return ESRCH;
@@ -658,7 +662,7 @@ FoundIt:
*
* otherwise, we need to increment 'join-count' and wait to be signaled
*/
count = thread->join_count;
int count = thread->join_count;
if (count >= 0) {
thread->join_count += 1;
pthread_cond_wait( &thread->join_cond, &gThreadListLock );