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

am 56731351: Merge "bionic: fix atfork hanlder_mutex deadlock"

Browse Source 
* commit '56731351de7230180fc99a1a4b0afd12f881b0f7':
  bionic: fix atfork hanlder_mutex deadlock
This commit is contained in:
Jean-Baptiste Queru 2012-03-26 18:25:43 -07:00 committed by Android Git Automerger
commit d7c6147eff
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/bionic/pthread-atfork.c
View File

@ -74,6 +74,7 @@ void __bionic_atfork_run_prepare()
void __bionic_atfork_run_child() void __bionic_atfork_run_child()
{ {
struct atfork_t *cursor; struct atfork_t *cursor;
pthread_mutexattr_t attr;
/* Call pthread_atfork() child handlers */ /* Call pthread_atfork() child handlers */
for (cursor = atfork_head.cqh_first; for (cursor = atfork_head.cqh_first;
@ -84,7 +85,9 @@ void __bionic_atfork_run_child()
} }
} }
pthread_mutex_unlock(&handler_mutex); pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&handler_mutex, &attr);
} }
void __bionic_atfork_run_parent() void __bionic_atfork_run_parent()