diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-04-23 20:32:31 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-04-23 20:32:31 +0000 |
| commit | 05b184de01c4e7bc3afda55e881d511f581d8c0b (patch) | |
| tree | 5f992173d348b9cc194660c7a0f9db8bb608b548 /src/common/compat.c | |
| parent | 5dc8062afaf3d753d303bf5b7402bc04f26ce95a (diff) | |
| download | tor-05b184de01c4e7bc3afda55e881d511f581d8c0b.tar.gz tor-05b184de01c4e7bc3afda55e881d511f581d8c0b.zip | |
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.
svn:r14430
Diffstat (limited to 'src/common/compat.c')
| -rw-r--r-- | src/common/compat.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index b92fa48ded..d9266da576 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1736,12 +1736,15 @@ struct tor_mutex_t { 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 @@ tor_cond_signal_all(tor_cond_t *cond) 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 |