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/or | |
| 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/or')
| -rw-r--r-- | src/or/main.c | 3 | ||||
| -rw-r--r-- | src/or/test.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 55803ae15c..2dc4b0697a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1781,8 +1781,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. */ @@ -1988,6 +1986,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, diff --git a/src/or/test.c b/src/or/test.c index 41d1d354aa..374abd1ab5 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -3991,6 +3991,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) { |