| commit | f9c5afb1f9d8e615ab98774a10bbf117962db66d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Feb 22 09:30:52 2012 -0800 |
| committer | android code review <noreply-gerritcodereview@google.com> | Wed Feb 22 09:30:53 2012 -0800 |
| tree | f657d4a39b7e45d0603b30762f4496f947ec043e | |
| parent | a60ff6c5b2ca76181b387d8c10aee22a2cbcf840 [diff] | |
| parent | e19d702b8e330cef87e0983733c427b5f7842144 [diff] |
Merge "Redesign dlopen() locks to be recursive per thread."
diff --git a/linker/dlfcn.c b/linker/dlfcn.c index 5964bd1..194a4ae 100644 --- a/linker/dlfcn.c +++ b/linker/dlfcn.c
@@ -42,7 +42,7 @@ #define likely(expr) __builtin_expect (expr, 1) #define unlikely(expr) __builtin_expect (expr, 0) -static pthread_mutex_t dl_lock = PTHREAD_MUTEX_INITIALIZER; +pthread_mutex_t dl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; static void set_dlerror(int err) {