diff options
| author | Wink Saville <wink@google.com> | 2010-09-22 14:51:53 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2010-09-22 14:51:53 -0700 |
| commit | b9e49ad56e5776ace7c6eab2e997d5b7acb16792 (patch) | |
| tree | c0e2ba58abab835fb00e89509a8922297038bdcf | |
| parent | fedbcde6ef552e84bf7ce7598bca7dddf1722d6a (diff) | |
| download | android_bionic-b9e49ad56e5776ace7c6eab2e997d5b7acb16792.tar.gz android_bionic-b9e49ad56e5776ace7c6eab2e997d5b7acb16792.tar.bz2 android_bionic-b9e49ad56e5776ace7c6eab2e997d5b7acb16792.zip | |
Use a recursive lock for pthread_once. DO NOT MERGE.
Backport change I9fc8b790 from Master to Gingerbread
Change-Id: I5cf48fcd4efb7991ed82f87d9365c19655dc9b7f
| -rw-r--r-- | libc/bionic/pthread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c index e21a1f9a7..b28cd9f65 100644 --- a/libc/bionic/pthread.c +++ b/libc/bionic/pthread.c @@ -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) ) { - 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) { - _normal_lock( &once_lock ); + pthread_mutex_lock( &once_lock ); if (*once_control == PTHREAD_ONCE_INIT) { (*init_routine)(); *once_control = ~PTHREAD_ONCE_INIT; } - _normal_unlock( &once_lock ); + pthread_mutex_unlock( &once_lock ); } return 0; } |