nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix check-spaces

Browse Source
This commit is contained in:
Nick Mathewson 2013-09-28 00:52:28 -04:00
parent e5f8c772f4
commit cc6529e9bb
8 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/compat_pthreads.c
View File

@ -240,3 +240,4 @@ tor_threads_init(void)
set_main_thread(); set_main_thread();
} }
} }

1
src/common/compat_threads.c
View File

@ -253,3 +253,4 @@ alert_sockets_close(alert_sockets_t *socks)
} }
socks->read_fd = socks->write_fd = -1; socks->read_fd = socks->write_fd = -1;
} }

2
src/common/compat_threads.h
View File

@ -44,7 +44,6 @@ typedef struct tor_mutex_t {
#endif #endif
} tor_mutex_t; } tor_mutex_t;
tor_mutex_t *tor_mutex_new(void); tor_mutex_t *tor_mutex_new(void);
tor_mutex_t *tor_mutex_new_nonrecursive(void); tor_mutex_t *tor_mutex_new_nonrecursive(void);
void tor_mutex_init(tor_mutex_t *m); void tor_mutex_init(tor_mutex_t *m);
@ -113,3 +112,4 @@ int alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags);
void alert_sockets_close(alert_sockets_t *socks); void alert_sockets_close(alert_sockets_t *socks);
#endif #endif

3
src/common/compat_winthreads.c
View File

@ -33,7 +33,6 @@ spawn_func(void (*func)(void *), void *data)
return 0; return 0;
} }
/** End the current thread/process. /** End the current thread/process.
*/ */
void void
@ -46,7 +45,6 @@ spawn_exit(void)
_exit(0); _exit(0);
} }
void void
tor_mutex_init(tor_mutex_t *m) tor_mutex_init(tor_mutex_t *m)
{ {
@ -195,3 +193,4 @@ tor_threads_init(void)
{ {
set_main_thread(); set_main_thread();
} }

1
src/common/workqueue.h
View File

@ -45,3 +45,4 @@ tor_socket_t replyqueue_get_socket(replyqueue_t *rq);
void replyqueue_process(replyqueue_t *queue); void replyqueue_process(replyqueue_t *queue);
#endif #endif

1
src/test/test.c
View File

@ -1258,7 +1258,6 @@ test_stats(void *arg)
tor_free(s); tor_free(s);
} }
static void * static void *
passthrough_test_setup(const struct testcase_t *testcase) passthrough_test_setup(const struct testcase_t *testcase)
{ {

1
src/test/test_threads.c
View File

@ -313,3 +313,4 @@ struct testcase_t thread_tests[] = {
&passthrough_setup, (void*)"tv" }, &passthrough_setup, (void*)"tv" },
END_OF_TESTCASES END_OF_TESTCASES
}; };

8
src/test/test_workqueue.c
View File

@ -293,9 +293,12 @@ replysock_readable_cb(tor_socket_t sock, short what, void *arg)
add_n_work_items(tp, n_to_send); add_n_work_items(tp, n_to_send);
} }
if (shutting_down == 0 && n_received+n_successful_cancel == n_sent && n_sent >= opt_n_items) { if (shutting_down == 0 &&
n_received+n_successful_cancel == n_sent &&
n_sent >= opt_n_items) {
shutting_down = 1; shutting_down = 1;
threadpool_queue_for_all(tp, NULL, workqueue_do_shutdown, shutdown_reply, NULL); threadpool_queue_for_all(tp, NULL,
workqueue_do_shutdown, shutdown_reply, NULL);
} }
} }
@ -416,3 +419,4 @@ main(int argc, char **argv)
return 0; return 0;
} }
} }