Threads: The master mutex was not initialized in some cases

diff --git a/ucw/threads.c b/ucw/threads.c
index f0c701403eae4de819cd1aa96718cce3ea567fd0..0cc958f6b93dcc63a0154480d0b9af30e5688545 100644 (file)
--- a/ucw/threads.c
+++ b/ucw/threads.c
@@ -67,6 +67,12 @@ ucwlib_tid(void)
 
 /*** Thread context ***/
 
+static void CONSTRUCTOR
+ucwlib_threads_init_master(void)
+{
+  pthread_mutex_init(&ucwlib_master_mutex, NULL);
+}
+
 #ifdef CONFIG_UCW_TLS
 
 __thread struct ucwlib_context ucwlib_context;
@@ -94,7 +100,6 @@ ucwlib_threads_init(void)
 {
   if (pthread_key_create(&ucwlib_context_key, ucwlib_free_thread_context) < 0)
     die("Cannot create pthread_key: %m");
-  pthread_mutex_init(&ucwlib_master_mutex, NULL);
 }
 
 struct ucwlib_context *