[or-cvs] r14430: Forward-port: I had apparently broken OSX and Freebsd by not (in tor/trunk: . src/common src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-04-23 16:32:31 -0400 (Wed, 23 Apr 2008)
New Revision: 14430

Modified:
   tor/trunk/
   tor/trunk/src/common/compat.c
   tor/trunk/src/or/main.c
   tor/trunk/src/or/test.c
Log:
 r15304@tombo:  nickm | 2008-04-23 16:31:40 -0400
 Forward-port: I had apparently broken OSX and Freebsd by not initializing threading before we initialize the logging system.  This patch should do so, and fix bug 671.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r15304] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/trunk/src/common/compat.c
===================================================================
--- tor/trunk/src/common/compat.c	2008-04-23 20:32:09 UTC (rev 14429)
+++ tor/trunk/src/common/compat.c	2008-04-23 20:32:31 UTC (rev 14430)
@@ -1736,12 +1736,15 @@
   pthread_mutex_t mutex;
 };
 static pthread_mutexattr_t attr_reentrant;
+static int threads_initialized = 0;
 /** Allocate and return new lock. */
 tor_mutex_t *
 tor_mutex_new(void)
 {
   int err;
   tor_mutex_t *mutex = tor_malloc_zero(sizeof(tor_mutex_t));
+  if (PREDICT_UNLIKELY(!threads_initialized))
+    tor_threads_init();
   err = pthread_mutex_init(&mutex->mutex, &attr_reentrant);
   if (PREDICT_UNLIKELY(err)) {
     log_err(LD_GENERAL, "Error %d creating a mutex.", err);
@@ -1858,10 +1861,11 @@
 void
 tor_threads_init(void)
 {
-#ifdef USE_PTHREADS
-  pthread_mutexattr_init(&attr_reentrant);
-  pthread_mutexattr_settype(&attr_reentrant, PTHREAD_MUTEX_RECURSIVE);
-#endif
+  if (!threads_initialized) {
+    pthread_mutexattr_init(&attr_reentrant);
+    pthread_mutexattr_settype(&attr_reentrant, PTHREAD_MUTEX_RECURSIVE);
+    threads_initialized = 1;
+  }
 }
 #elif defined(USE_WIN32_THREADS)
 #if 0

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2008-04-23 20:32:09 UTC (rev 14429)
+++ tor/trunk/src/or/main.c	2008-04-23 20:32:31 UTC (rev 14430)
@@ -1781,8 +1781,6 @@
   /* Have the log set up with our application name. */
   tor_snprintf(buf, sizeof(buf), "Tor %s", get_version());
   log_set_application_name(buf);
-  /* Initialize threading. */
-  tor_threads_init();
   /* Initialize the history structures. */
   rep_hist_init();
   /* Initialize the service cache. */
@@ -1988,6 +1986,7 @@
 tor_main(int argc, char *argv[])
 {
   int result = 0;
+  tor_threads_init();
   init_logging();
 #ifdef USE_DMALLOC
   int r = CRYPTO_set_mem_ex_functions(_tor_malloc, _tor_realloc,

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2008-04-23 20:32:09 UTC (rev 14429)
+++ tor/trunk/src/or/test.c	2008-04-23 20:32:31 UTC (rev 14430)
@@ -3991,6 +3991,7 @@
   int verbose = 0, any_selected = 0;
   int loglevel = LOG_ERR;
 
+  tor_threads_init();
   init_logging();
 
   for (i = 1; i < c; ++i) {