From e19d702b8e330cef87e0983733c427b5f7842144 Mon Sep 17 00:00:00 2001 From: Pavel Chupin Date: Mon, 20 Feb 2012 10:49:13 +0400 Subject: [PATCH] Redesign dlopen() locks to be recursive per thread. That is to fix the bug: dlxxx functions can't be called recursively. For example, if we use dlopen() to use open one library whose constructor also calls dlopen() in order to open another library, then the thread is dead-blocked. By changing the dl_lock from a non-recursive lock to a recursive lock, we can prevent the thread from dead-blocked by recursive dlxxx calls in the same thread context. Change-Id: I1018b41c82f4641cc009c0a2eda31f5a47a534f9 Signed-off-by: Pavel Chupin Signed-off-by: Jack Ren Signed-off-by: Bruce Beare --- linker/dlfcn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linker/dlfcn.c b/linker/dlfcn.c index 5964bd16e..194a4aeb2 100644 --- a/linker/dlfcn.c +++ b/linker/dlfcn.c @@ -42,7 +42,7 @@ static const char *dl_errors[] = { #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) {