X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fthreads.c;h=d9100119f601210692f59e6c58b4704c4dac2a85;hb=6c4c397f94ec5f5df6bcc178fb5fa4e84d3505fc;hp=1260e8759ae1a3b0ee96303e850c752bba6ec3eb;hpb=36374b48f5994303bbd414c567050a929bea2598;p=libucw.git

diff --git a/ucw/threads.c b/ucw/threads.c
index 1260e875..d9100119 100644
--- a/ucw/threads.c
+++ b/ucw/threads.c
@@ -1,14 +1,14 @@
 /*
  *	The UCW Library -- Threading Helpers
  *
- *	(c) 2006 Martin Mares <mj@ucw.cz>
+ *	(c) 2006--2010 Martin Mares <mj@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  */
 
-#include "ucw/lib.h"
-#include "ucw/threads.h"
+#include <ucw/lib.h>
+#include <ucw/threads.h>
 
 #ifdef CONFIG_UCW_THREADS
 
@@ -28,23 +28,24 @@ gettid(void)
 #endif
 #endif
 
-static pthread_key_t ucwlib_context_key;
+/*** Library lock ***/
+
 static pthread_mutex_t ucwlib_master_mutex;
 
-static void
-ucwlib_free_thread_context(void *p)
+void
+ucwlib_lock(void)
 {
-  xfree(p);
+  pthread_mutex_lock(&ucwlib_master_mutex);
 }
 
-static void CONSTRUCTOR
-ucwlib_threads_init(void)
+void
+ucwlib_unlock(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);
+  pthread_mutex_unlock(&ucwlib_master_mutex);
 }
 
+/*** Thread identifiers ***/
+
 static int
 ucwlib_tid(void)
 {
@@ -64,50 +65,62 @@ ucwlib_tid(void)
   return tid;
 }
 
-struct ucwlib_context *
-ucwlib_thread_context(void)
-{
-  struct ucwlib_context *c = pthread_getspecific(ucwlib_context_key);
-  if (!c)
-    {
-      c = xmalloc_zero(sizeof(*c));
-      c->thread_id = ucwlib_tid();
-      pthread_setspecific(ucwlib_context_key, c);
-    }
-  return c;
-}
+/*** Thread context ***/
 
-void
-ucwlib_lock(void)
+static void CONSTRUCTOR_WITH_PRIORITY(10000)
+ucwlib_threads_init_master(void)
 {
-  pthread_mutex_lock(&ucwlib_master_mutex);
+  pthread_mutex_init(&ucwlib_master_mutex, NULL);
 }
 
-void
-ucwlib_unlock(void)
+#ifdef CONFIG_UCW_TLS
+
+__thread struct ucwlib_context ucwlib_context;
+
+int
+ucwlib_thread_id(struct ucwlib_context *c)
 {
-  pthread_mutex_unlock(&ucwlib_master_mutex);
+  if (!c->_thread_id)
+    c->_thread_id = ucwlib_tid();
+  return c->_thread_id;
 }
 
 #else
 
-struct ucwlib_context *
-ucwlib_thread_context(void)
+static pthread_key_t ucwlib_context_key;
+
+static void
+ucwlib_free_thread_context(void *p)
 {
-  static struct ucwlib_context ucwlib_context;
-  return &ucwlib_context;
+  xfree(p);
 }
 
-void
-ucwlib_lock(void)
+static void CONSTRUCTOR_WITH_PRIORITY(10000)
+ucwlib_threads_init(void)
 {
+  if (pthread_key_create(&ucwlib_context_key, ucwlib_free_thread_context) < 0)
+    die("Cannot create pthread_key: %m");
 }
 
-void
-ucwlib_unlock(void)
+struct ucwlib_context *
+ucwlib_thread_context(void)
 {
+  struct ucwlib_context *c = pthread_getspecific(ucwlib_context_key);
+  if (!c)
+    {
+      c = xmalloc_zero(sizeof(*c));
+      c->_thread_id = ucwlib_tid();
+      pthread_setspecific(ucwlib_context_key, c);
+    }
+  return c;
 }
 
+#endif /* CONFIG_UCW_TLS */
+
+#else /* !CONFIG_UCW_THREADS */
+
+struct ucwlib_context ucwlib_default_context;
+
 #endif
 
 #ifdef TEST
@@ -116,7 +129,7 @@ int main(void)
 {
   ucwlib_lock();
   ucwlib_unlock();
-  msg(L_INFO, "tid=%d", ucwlib_thread_context()->thread_id);
+  msg(L_INFO, "tid=%d", ucwlib_thread_id(ucwlib_thread_context()));
   return 0;
 }