commit ccc3d1eea124cbeb1ec2d711d5892db1dd4445d3
author Wink Saville <wink@google.com> Mon Jun 28 11:41:16 2010 -0700
committer Wink Saville <wink@google.com> Mon Jun 28 11:41:16 2010 -0700
tree 80cb85b2175fb5da5eb96d980ea7cc91365581c5
parent 1deef576b37b5951d1274bc63a89843a8c1d6bc4

Use a recursive lock for pthread_once.

bug: 2292366
Change-Id: I9fc8b790dcfcb30ca94a0beb340d43fe5cd6c22e

libc/bionic/pthread.c

diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c
index 061cce1..a60da27 100644
--- a/libc/bionic/pthread.c
+++ b/libc/bionic/pthread.c
@@ -1861,15 +1861,15 @@
  */
 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;
 }