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

Use a recursive lock for pthread_once. DO NOT MERGE.

Browse Source 
Backport change I9fc8b790 from Master to Gingerbread

Change-Id: I5cf48fcd4efb7991ed82f87d9365c19655dc9b7f
This commit is contained in:
Wink Saville
2010-09-22 14:51:53 -07:00
parent fedbcde6ef
commit b9e49ad56e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libc/bionic/pthread.c
View File

@@ -1866,15 +1866,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;
} }