r15303@tombo: nickm | 2008-04-23 16:29:45 -0400
Embarassing. 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. Forward-port candidate. svn:r14429
This commit is contained in:
parent
94a9eaaf14
commit
5dfd0c354f
|
@ -1,3 +1,10 @@
|
|||
Changes in version 0.2.0.25-rc - 2008-04-23
|
||||
o Major bugfixes:
|
||||
- Remember to initialize threading before initializing logging.
|
||||
Otherwise, many BSD-family implementations will crash hard on
|
||||
startup. Fixes bug 671. Bugfix on 0.2.0.24-rc.
|
||||
|
||||
|
||||
Changes in version 0.2.0.24-rc - 2008-04-22
|
||||
o New directory authorities:
|
||||
- Take lefkada out of the list of v3 directory authorities, since
|
||||
|
|
|
@ -1747,12 +1747,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);
|
||||
|
@ -1869,8 +1872,11 @@ tor_cond_signal_all(tor_cond_t *cond)
|
|||
void
|
||||
tor_threads_init(void)
|
||||
{
|
||||
pthread_mutexattr_init(&attr_reentrant);
|
||||
pthread_mutexattr_settype(&attr_reentrant, PTHREAD_MUTEX_RECURSIVE);
|
||||
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
|
||||
|
|
|
@ -1768,8 +1768,6 @@ tor_init(int argc, char *argv[])
|
|||
/* 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. */
|
||||
|
@ -1965,6 +1963,7 @@ int
|
|||
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,
|
||||
|
|
|
@ -3561,6 +3561,7 @@ main(int c, char**v)
|
|||
int verbose = 0, any_selected = 0;
|
||||
int loglevel = LOG_ERR;
|
||||
|
||||
tor_threads_init();
|
||||
init_logging();
|
||||
|
||||
for (i = 1; i < c; ++i) {
|
||||
|
|
Loading…
Reference in New Issue