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

Merge "Use a recursive lock for pthread_once."

Browse Source
This commit is contained in:
Wink Saville 2010-06-28 12:13:00 -07:00 committed by Android (Google) Code Review
commit 68bcaa4a7b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/bionic/pthread.c
View File

@ -1861,15 +1861,15 @@ int pthread_getcpuclockid(pthread_t tid, clockid_t *clockid)
*/ */
int pthread_once( pthread_once_t* once_control, void (*init_routine)(void) ) int pthread_once( pthread_once_t* once_control, void (*init_routine)(void) )
{ {
static pthread_mutex_t once_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t once_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
if (*once_control == PTHREAD_ONCE_INIT) { if (*once_control == PTHREAD_ONCE_INIT) {
_normal_lock( &once_lock ); pthread_mutex_lock( &once_lock );
if (*once_control == PTHREAD_ONCE_INIT) { if (*once_control == PTHREAD_ONCE_INIT) {
(*init_routine)(); (*init_routine)();
*once_control = ~PTHREAD_ONCE_INIT; *once_control = ~PTHREAD_ONCE_INIT;
} }
_normal_unlock( &once_lock ); pthread_mutex_unlock( &once_lock );
} }
return 0; return 0;
} }