diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-05-29 10:18:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-05-30 18:16:24 -0400 |
| commit | fd992deeea769721dc95bacb40ea360ef42f76dd (patch) | |
| tree | 70e77957df737e808fd295696fb5b7ddce14fd11 /src/common/util.c | |
| parent | d66c3797650698778bd098bbaf9d3bbeebfa9fcf (diff) | |
| download | tor-fd992deeea769721dc95bacb40ea360ef42f76dd.tar.gz tor-fd992deeea769721dc95bacb40ea360ef42f76dd.zip | |
Don't attempt to log messages to a controller from a worker thread.
This patch adds a function to determine whether we're in the main
thread, and changes control_event_logmsg() to return immediately if
we're in a subthread. This is necessary because otherwise we will
call connection_write_to_buf, which modifies non-locked data
structures.
Bugfix on 0.2.0.x; fix for at least one of the things currently
called "bug 977".
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c index a3338b1d18..7b9e5eb562 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2480,6 +2480,8 @@ start_daemon(void) if (fork() != 0) { exit(0); } + set_main_thread(); /* We are now the main thread. */ + return; } } |