diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-06 08:42:20 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-06 08:42:20 +0000 |
| commit | 365ccf0742b597bc9b28be30f0af6581a734d019 (patch) | |
| tree | 9c5c627104514aace1a856445d1b86c837538d60 /src/or/cpuworker.c | |
| parent | 000b7b287c770ce4b7a88eaae5f87601d61faf4a (diff) | |
| download | tor-365ccf0742b597bc9b28be30f0af6581a734d019.tar tor-365ccf0742b597bc9b28be30f0af6581a734d019.tar.gz | |
r8725@Kushana: nickm | 2006-09-06 04:39:29 -0400
spawn_func fixes: have cpuworker_main and dnsworker_main confirm to the right interfaces [casting func to void* is icky]. Also, make pthread_create() build without warnings.
svn:r8327
Diffstat (limited to 'src/or/cpuworker.c')
| -rw-r--r-- | src/or/cpuworker.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index daab7d296..17c176ae1 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -36,7 +36,7 @@ static int num_cpuworkers_busy=0; * the last time we got a key rotation event. */ static time_t last_rotation_time=0; -static int cpuworker_main(void *data); +static void cpuworker_main(void *data); static int spawn_cpuworker(void); static void spawn_enough_cpuworkers(void); static void process_pending_task(connection_t *cpuworker); @@ -222,7 +222,7 @@ done_processing: * (Note: this _should_ be by addr/port, since we're concerned with specific * connections, not with routers (where we'd use identity).) */ -static int +static void cpuworker_main(void *data) { char question[ONIONSKIN_CHALLENGE_LEN]; @@ -308,7 +308,6 @@ cpuworker_main(void *data) tor_close_socket(fd); crypto_thread_cleanup(); spawn_exit(); - return 0; /* windows wants this function to return an int */ } /** Launch a new cpuworker. Return 0 if we're happy, -1 if we failed. @@ -333,7 +332,7 @@ spawn_cpuworker(void) tor_assert(fdarray[1] >= 0); fd = fdarray[0]; - spawn_func((void*) cpuworker_main, (void*)fdarray); + spawn_func(cpuworker_main, (void*)fdarray); log_debug(LD_OR,"just spawned a cpu worker."); #ifndef TOR_IS_MULTITHREADED tor_close_socket(fdarray[1]); /* don't need the worker's side of the pipe */ |