August 2015 - tor-commits - lists.torproject.org

[tor/master] Refactor initialization logic for control-event-queue
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit 81f3572467583c54eb2a22c3af93f7c819796563 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 09:35:26 2015 -0400 Refactor initialization logic for control-event-queue This puts the init logic in a separate function, which we will need once we have locking. --- src/or/config.c | 3 +++ src/or/control.c | 38 +++++++++++++++++++++++--------------- src/or/control.h | 2 ++ src/test/testing_common.c | 2 ++ 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 011a36d..9573b61 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1106,6 +1106,9 @@ options_act_reversible(const or_options_t *old_options, char **msg) init_libevent(options); libevent_initialized = 1; + /* This has to come up after libevent is initialized. */ + control_initialize_event_queue(); + /* * Initialize the scheduler - this has to come after * options_init_from_torrc() sets up libevent - why yes, that seems diff --git a/src/or/control.c b/src/or/control.c index 859c660..4b8e9c1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -605,6 +605,24 @@ static smartlist_t *queued_control_events = NULL; * queued_control_events. */ static struct event *flush_queued_events_event = NULL; +void +control_initialize_event_queue(void) +{ + if (queued_control_events == NULL) { + queued_control_events = smartlist_new(); + } + + if (flush_queued_events_event == NULL) { + struct event_base *b = tor_libevent_get_base(); + if (b) { + flush_queued_events_event = tor_event_new(b, + -1, 0, flush_queued_events_cb, + NULL); + tor_assert(flush_queued_events_event); + } + } +} + /** Helper: inserts an event on the list of events queued to be sent to * one or more controllers, and schedules the events to be flushed if needed. * @@ -619,10 +637,6 @@ static struct event *flush_queued_events_event = NULL; MOCK_IMPL(STATIC void, queue_control_event_string,(uint16_t event, char *msg)) { - if (PREDICT_UNLIKELY(queued_control_events == NULL)) { - queued_control_events = smartlist_new(); - } - /* This is redundant with checks done elsewhere, but it's a last-ditch * attempt to avoid queueing something we shouldn't have to queue. */ if (PREDICT_UNLIKELY( ! EVENT_IS_INTERESTING(event) )) { @@ -634,27 +648,21 @@ queue_control_event_string,(uint16_t event, char *msg)) return; } - /* No queueing an event while queueing an event */ - ++block_event_queue; - queued_event_t *ev = tor_malloc(sizeof(*ev)); ev->event = event; ev->msg = msg; + /* No queueing an event while queueing an event */ + ++block_event_queue; + + tor_assert(queued_control_events); smartlist_add(queued_control_events, ev); /* We just put the first event on the queue; mark the queue to be * flushed. */ if (smartlist_len(queued_control_events) == 1) { - if (PREDICT_UNLIKELY(flush_queued_events_event == NULL)) { - struct event_base *b = tor_libevent_get_base(); - tor_assert(b); - flush_queued_events_event = tor_event_new(b, - -1, 0, flush_queued_events_cb, - NULL); - tor_assert(flush_queued_events_event); - } + tor_assert(flush_queued_events_event); event_active(flush_queued_events_event, EV_READ, 1); } diff --git a/src/or/control.h b/src/or/control.h index 8aa4780..574dd85 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -12,6 +12,8 @@ #ifndef TOR_CONTROL_H #define TOR_CONTROL_H +void control_initialize_event_queue(void); + void control_update_global_event_mask(void); void control_adjust_event_log_severity(void); diff --git a/src/test/testing_common.c b/src/test/testing_common.c index 7f387c0..441024b 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -14,6 +14,7 @@ const char tor_git_revision[] = ""; #include "orconfig.h" #include "or.h" +#include "control.h" #include "config.h" #include "rephist.h" #include "backtrace.h" @@ -237,6 +238,7 @@ main(int c, const char **v) update_approx_time(time(NULL)); options = options_new(); tor_threads_init(); + control_initialize_event_queue(); init_logging(1); configure_backtrace_handler(get_version());

1 0

[tor/master] Multithreading support for event-queue code.
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit e2a6a7ec6178834c3de7a3be614679120e2c00c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 10:10:11 2015 -0400 Multithreading support for event-queue code. --- src/or/control.c | 61 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 4b8e9c1..2be99d5 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -594,13 +594,20 @@ typedef struct queued_event_s { char *msg; } queued_event_t; -/** If this is greater than 0, we don't allow new events to be queued. */ +/** If this is greater than 0, we don't allow new events to be queued. + * XXXX This should be thread-local. */ static int block_event_queue = 0; /** Holds a smartlist of queued_event_t objects that may need to be sent * to one or more controllers */ static smartlist_t *queued_control_events = NULL; +/** True if the flush_queued_events_event is pending. */ +static int flush_queued_event_pending = 0; + +/** Lock to protect the above fields. */ +static tor_mutex_t *queued_control_events_lock = NULL; + /** An event that should fire in order to flush the contents of * queued_control_events. */ static struct event *flush_queued_events_event = NULL; @@ -621,6 +628,10 @@ control_initialize_event_queue(void) tor_assert(flush_queued_events_event); } } + + if (queued_control_events_lock == NULL) { + queued_control_events_lock = tor_mutex_new(); + } } /** Helper: inserts an event on the list of events queued to be sent to @@ -643,30 +654,43 @@ queue_control_event_string,(uint16_t event, char *msg)) tor_free(msg); return; } - if (block_event_queue) { - tor_free(msg); - return; - } queued_event_t *ev = tor_malloc(sizeof(*ev)); ev->event = event; ev->msg = msg; + tor_mutex_acquire(queued_control_events_lock); + if (block_event_queue) { /* XXXX This should be thread-specific. */ + tor_mutex_release(queued_control_events_lock); + tor_free(msg); + tor_free(ev); + return; + } + /* No queueing an event while queueing an event */ ++block_event_queue; tor_assert(queued_control_events); smartlist_add(queued_control_events, ev); - /* We just put the first event on the queue; mark the queue to be - * flushed. + int activate_event = 0; + if (! flush_queued_event_pending && in_main_thread()) { + activate_event = 1; + flush_queued_event_pending = 1; + } + + --block_event_queue; + + tor_mutex_release(queued_control_events_lock); + + /* We just put an event on the queue; mark the queue to be + * flushed. We only do this from the main thread for now; otherwise, + * we'd need to incur locking overhead in Libevent or use a socket. */ - if (smartlist_len(queued_control_events) == 1) { + if (activate_event) { tor_assert(flush_queued_events_event); event_active(flush_queued_events_event, EV_READ, 1); } - - --block_event_queue; } /** Release all storage held by ev. */ @@ -687,15 +711,20 @@ queued_event_free(queued_event_t *ev) static void queued_events_flush_all(int force) { - smartlist_t *all_conns = get_connection_array(); - smartlist_t *controllers = smartlist_new(); - if (PREDICT_UNLIKELY(queued_control_events == NULL)) { return; } + smartlist_t *all_conns = get_connection_array(); + smartlist_t *controllers = smartlist_new(); + smartlist_t *queued_events; + tor_mutex_acquire(queued_control_events_lock); /* No queueing an event while flushing events. */ ++block_event_queue; + flush_queued_event_pending = 0; + queued_events = queued_control_events; + queued_control_events = smartlist_new(); + tor_mutex_release(queued_control_events_lock); /* Gather all the controllers that will care... */ SMARTLIST_FOREACH_BEGIN(all_conns, connection_t *, conn) { @@ -708,7 +737,7 @@ queued_events_flush_all(int force) } } SMARTLIST_FOREACH_END(conn); - SMARTLIST_FOREACH_BEGIN(queued_control_events, queued_event_t *, ev) { + SMARTLIST_FOREACH_BEGIN(queued_events, queued_event_t *, ev) { const event_mask_t bit = ((event_mask_t)1) << ev->event; const size_t msg_len = strlen(ev->msg); SMARTLIST_FOREACH_BEGIN(controllers, control_connection_t *, @@ -728,10 +757,12 @@ queued_events_flush_all(int force) } SMARTLIST_FOREACH_END(control_conn); } - smartlist_clear(queued_control_events); + smartlist_free(queued_events); smartlist_free(controllers); + tor_mutex_acquire(queued_control_events_lock); --block_event_queue; + tor_mutex_release(queued_control_events_lock); } /** Libevent callback: Flushes pending events to controllers that are

1 0

[tor/master] Add comments for thread-local storage functions
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit e8fe77530ad6238dc16781b0032899f3affa778f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 17 13:36:56 2015 -0400 Add comments for thread-local storage functions --- src/common/compat_threads.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index a1b5056..9f34054 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -119,9 +119,26 @@ typedef struct tor_threadlocal_s { #endif } tor_threadlocal_t; +/** Initialize a thread-local variable. + * + * After you call this function on a tor_threadlocal_t, you can call + * tor_threadlocal_set to change the current value of this variable for the + * current thread, and tor_threadlocal_get to retrieve the current value for + * the current thread. Each thread has its own value. + **/ int tor_threadlocal_init(tor_threadlocal_t *threadlocal); +/** + * Release all resource associated with a thread-local variable. + */ void tor_threadlocal_destroy(tor_threadlocal_t *threadlocal); +/** + * Return the current value of a thread-local variable for this thread. + */ void *tor_threadlocal_get(tor_threadlocal_t *threadlocal); +/** + * Change the current value of a thread-local variable for this thread to + * value. + */ void tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value); #endif

1 0

[tor/master] Use thread-local storage to block event_queue recursion.
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit 9ec94f1d22a87fbf86f721c6106f78f85b8be33c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 10:49:19 2015 -0400 Use thread-local storage to block event_queue recursion. --- src/common/compat_pthreads.c | 27 +++++++++++++++++++++++ src/common/compat_threads.h | 13 +++++++++++ src/common/compat_winthreads.c | 27 +++++++++++++++++++++++ src/or/control.c | 47 +++++++++++++++++++++++++--------------- src/test/test_threads.c | 14 +++++++----- 5 files changed, 104 insertions(+), 24 deletions(-) diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index b78ab3d..4b32fc9 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -275,6 +275,33 @@ tor_cond_signal_all(tor_cond_t *cond) pthread_cond_broadcast(&cond->cond); } +int +tor_threadlocal_init(tor_threadlocal_t *threadlocal) +{ + int err = pthread_key_create(&threadlocal->key, NULL); + return err ? -1 : 0; +} + +void +tor_threadlocal_destroy(tor_threadlocal_t *threadlocal) +{ + pthread_key_delete(threadlocal->key); + memset(threadlocal, 0, sizeof(tor_threadlocal_t)); +} + +void * +tor_threadlocal_get(tor_threadlocal_t *threadlocal) +{ + return pthread_getspecific(threadlocal->key); +} + +void +tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value) +{ + int err = pthread_setspecific(threadlocal->key, value); + tor_assert(err == 0); +} + /** Set up common structures for use by threading. */ void tor_threads_init(void) diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index acf3083..a1b5056 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -111,5 +111,18 @@ typedef struct alert_sockets_s { int alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags); void alert_sockets_close(alert_sockets_t *socks); +typedef struct tor_threadlocal_s { +#ifdef _WIN32 + DWORD index; +#else + pthread_key_t key; +#endif +} tor_threadlocal_t; + +int tor_threadlocal_init(tor_threadlocal_t *threadlocal); +void tor_threadlocal_destroy(tor_threadlocal_t *threadlocal); +void *tor_threadlocal_get(tor_threadlocal_t *threadlocal); +void tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value); + #endif diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c index 71b994c..3d9e236 100644 --- a/src/common/compat_winthreads.c +++ b/src/common/compat_winthreads.c @@ -123,6 +123,33 @@ tor_cond_signal_all(tor_cond_t *cond) } int +tor_threadlocal_init(tor_threadlocal_t *threadlocal) +{ + threadlocal->index = TlsAlloc(); + return (threadlocal->index == TLS_OUT_OF_INDEXES) ? -1 : 0; +} + +void +tor_threadlocal_destroy(tor_threadlocal_t *threadlocal) +{ + TlsFree(threadlocal->index); + memset(threadlocal, 0, sizeof(tor_threadlocal_t)); +} + +void * +tor_threadlocal_get(tor_threadlocal_t *threadlocal) +{ + return TlsGetValue(threadlocal->index); +} + +void +tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value) +{ + BOOL ok = TlsSetValue(threadlocal->index, value); + tor_assert(ok); +} + +int tor_cond_wait(tor_cond_t *cond, tor_mutex_t *lock_, const struct timeval *tv) { CRITICAL_SECTION *lock = &lock_->mutex; diff --git a/src/or/control.c b/src/or/control.c index 2be99d5..c805465 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -594,9 +594,9 @@ typedef struct queued_event_s { char *msg; } queued_event_t; -/** If this is greater than 0, we don't allow new events to be queued. - * XXXX This should be thread-local. */ -static int block_event_queue = 0; +/** Pointer to int. If this is greater than 0, we don't allow new events to be + * queued. */ +static tor_threadlocal_t block_event_queue; /** Holds a smartlist of queued_event_t objects that may need to be sent * to one or more controllers */ @@ -631,9 +631,21 @@ control_initialize_event_queue(void) if (queued_control_events_lock == NULL) { queued_control_events_lock = tor_mutex_new(); + tor_threadlocal_init(&block_event_queue); } } +static int * +get_block_event_queue(void) +{ + int *val = tor_threadlocal_get(&block_event_queue); + if (PREDICT_UNLIKELY(val == NULL)) { + val = tor_malloc_zero(sizeof(int)); + tor_threadlocal_set(&block_event_queue, val); + } + return val; +} + /** Helper: inserts an event on the list of events queued to be sent to * one or more controllers, and schedules the events to be flushed if needed. * @@ -655,21 +667,20 @@ queue_control_event_string,(uint16_t event, char *msg)) return; } - queued_event_t *ev = tor_malloc(sizeof(*ev)); - ev->event = event; - ev->msg = msg; - - tor_mutex_acquire(queued_control_events_lock); - if (block_event_queue) { /* XXXX This should be thread-specific. */ - tor_mutex_release(queued_control_events_lock); + int *block_event_queue = get_block_event_queue(); + if (*block_event_queue) { tor_free(msg); - tor_free(ev); return; } + queued_event_t *ev = tor_malloc(sizeof(*ev)); + ev->event = event; + ev->msg = msg; + /* No queueing an event while queueing an event */ - ++block_event_queue; + ++*block_event_queue; + tor_mutex_acquire(queued_control_events_lock); tor_assert(queued_control_events); smartlist_add(queued_control_events, ev); @@ -679,10 +690,10 @@ queue_control_event_string,(uint16_t event, char *msg)) flush_queued_event_pending = 1; } - --block_event_queue; - tor_mutex_release(queued_control_events_lock); + --*block_event_queue; + /* We just put an event on the queue; mark the queue to be * flushed. We only do this from the main thread for now; otherwise, * we'd need to incur locking overhead in Libevent or use a socket. @@ -718,9 +729,11 @@ queued_events_flush_all(int force) smartlist_t *controllers = smartlist_new(); smartlist_t *queued_events; + int *block_event_queue = get_block_event_queue(); + ++*block_event_queue; + tor_mutex_acquire(queued_control_events_lock); /* No queueing an event while flushing events. */ - ++block_event_queue; flush_queued_event_pending = 0; queued_events = queued_control_events; queued_control_events = smartlist_new(); @@ -760,9 +773,7 @@ queued_events_flush_all(int force) smartlist_free(queued_events); smartlist_free(controllers); - tor_mutex_acquire(queued_control_events_lock); - --block_event_queue; - tor_mutex_release(queued_control_events_lock); + --*block_event_queue; } /** Libevent callback: Flushes pending events to controllers that are diff --git a/src/test/test_threads.c b/src/test/test_threads.c index 2ac08d4..35f5dc8 100644 --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@ -28,7 +28,7 @@ static unsigned long thread_fn_tid1, thread_fn_tid2; static void thread_test_func_(void* _s) ATTR_NORETURN; /** How many iterations have the threads in the unit test run? */ -static int t1_count = 0, t2_count = 0; +static tor_threadlocal_t count; /** Helper function for threading unit tests: This function runs in a * subthread. It grabs its own mutex (start1 or start2) to make sure that it @@ -38,19 +38,19 @@ static void thread_test_func_(void* _s) { char *s = _s; - int i, *count; + int i; tor_mutex_t *m; char buf[64]; char **cp; + int *mycount = tor_malloc_zero(sizeof(int)); + tor_threadlocal_set(&count, mycount); if (!strcmp(s, "thread 1")) { m = thread_test_start1_; cp = &thread1_name_; - count = &t1_count; thread_fn_tid1 = tor_get_thread_id(); } else { m = thread_test_start2_; cp = &thread2_name_; - count = &t2_count; thread_fn_tid2 = tor_get_thread_id(); } @@ -62,8 +62,10 @@ thread_test_func_(void* _s) for (i=0; i<10000; ++i) { tor_mutex_acquire(thread_test_mutex_); strmap_set(thread_test_strmap_, "last to run", *cp); - ++*count; tor_mutex_release(thread_test_mutex_); + int *tls_count = tor_threadlocal_get(&count); + tor_assert(tls_count == mycount); + ++*tls_count; } tor_mutex_acquire(thread_test_mutex_); strmap_set(thread_test_strmap_, s, *cp); @@ -89,6 +91,7 @@ test_threads_basic(void *arg) tv.tv_usec=100*1000; #endif (void) arg; + tt_int_op(tor_threadlocal_init(&count), OP_EQ, 0); set_main_thread(); @@ -128,7 +131,6 @@ test_threads_basic(void *arg) tor_mutex_free(thread_test_mutex_); if (timedout) { - printf("\nTimed out: %d %d", t1_count, t2_count); tt_assert(strmap_get(thread_test_strmap_, "thread 1")); tt_assert(strmap_get(thread_test_strmap_, "thread 2")); tt_assert(!timedout);

1 0

[tor/master] Merge branch 'decouple_controller_events_squashed'
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit eafae7f677364175e384d0e2c79f05e7d300049d Merge: fe4c0a1 087cf88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 18 08:56:31 2015 -0400 Merge branch 'decouple_controller_events_squashed' changes/decouple_control_events | 8 + src/common/compat_pthreads.c | 27 +++ src/common/compat_threads.h | 36 ++++ src/common/compat_winthreads.c | 43 ++++ src/or/config.c | 3 + src/or/control.c | 405 ++++++++++++++++++++++++++++--------- src/or/control.h | 23 ++- src/or/main.c | 2 +- src/test/test_controller_events.c | 12 +- src/test/test_hs.c | 12 +- src/test/test_pt.c | 12 +- src/test/test_threads.c | 14 +- src/test/testing_common.c | 2 + 13 files changed, 468 insertions(+), 131 deletions(-) diff --cc src/or/main.c index 06fc541,ee56e10..08fd294 --- a/src/or/main.c +++ b/src/or/main.c @@@ -1007,34 -1007,9 +1007,34 @@@ directory_all_unreachable_cb(evutil_soc connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_NET_UNREACHABLE); } - control_event_general_status(LOG_ERR, "DIR_ALL_UNREACHABLE"); + control_event_general_error("DIR_ALL_UNREACHABLE"); } +static struct event *directory_all_unreachable_cb_event = NULL; + +/** We've just tried every dirserver we know about, and none of + * them were reachable. Assume the network is down. Change state + * so next time an application connection arrives we'll delay it + * and try another directory fetch. Kill off all the circuit_wait + * streams that are waiting now, since they will all timeout anyway. + */ +void +directory_all_unreachable(time_t now) +{ + (void)now; + + stats_n_seconds_working=0; /* reset it */ + + if (!directory_all_unreachable_cb_event) { + directory_all_unreachable_cb_event = + tor_event_new(tor_libevent_get_base(), + -1, EV_READ, directory_all_unreachable_cb, NULL); + tor_assert(directory_all_unreachable_cb_event); + } + + event_active(directory_all_unreachable_cb_event, EV_READ, 1); +} + /** This function is called whenever we successfully pull down some new * network statuses or server descriptors. */ void

1 0

[tor/master] Improve threadlocal documentation
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit 3d9952a3b14e83d265a09de9071dc3609e3a4cc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 18 08:36:58 2015 -0400 Improve threadlocal documentation --- src/common/compat_threads.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index 9f34054..71562ba 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -133,11 +133,17 @@ int tor_threadlocal_init(tor_threadlocal_t *threadlocal); void tor_threadlocal_destroy(tor_threadlocal_t *threadlocal); /** * Return the current value of a thread-local variable for this thread. + * + * It's undefined behavior to use this function if the threadlocal hasn't + * been initialized, or has been destroyed. */ void *tor_threadlocal_get(tor_threadlocal_t *threadlocal); /** * Change the current value of a thread-local variable for this thread to * value. + * + * It's undefined behavior to use this function if the threadlocal hasn't + * been initialized, or has been destroyed. */ void tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value);

1 0

[tor/master] Log meaningful messages before failing on windows with threadlocal.
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit 087cf882c6a9ef6b9617d21ef26c19c47a4fc660 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 18 08:37:15 2015 -0400 Log meaningful messages before failing on windows with threadlocal. --- src/common/compat_winthreads.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c index 3d9e236..381e338 100644 --- a/src/common/compat_winthreads.c +++ b/src/common/compat_winthreads.c @@ -139,14 +139,30 @@ tor_threadlocal_destroy(tor_threadlocal_t *threadlocal) void * tor_threadlocal_get(tor_threadlocal_t *threadlocal) { - return TlsGetValue(threadlocal->index); + void *value = TlsGetValue(threadlocal->index); + if (value == NULL) { + DWORD err = GetLastError(); + if (err != ERROR_SUCCESS) { + char *msg = format_win32_error(err); + log_err(LD_GENERAL, "Error retrieving thread-local value: %s", msg); + tor_free(msg); + tor_assert(err == ERROR_SUCCESS); + } + } + return value; } void tor_threadlocal_set(tor_threadlocal_t *threadlocal, void *value) { BOOL ok = TlsSetValue(threadlocal->index, value); - tor_assert(ok); + if (!ok) { + DWORD err = GetLastError(); + char *msg = format_win32_error(err); + log_err(LD_GENERAL, "Error adjusting thread-local value: %s", msg); + tor_free(msg); + tor_assert(ok); + } } int

1 0

[trunnel/master] Generate correct function signature for $type_encode
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit e0901b36e87c348dc3228961c7a833fa5a1b2d62 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 18 14:39:21 2015 +0200 Generate correct function signature for $type_encode --- lib/trunnel/CodeGen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/CodeGen.py b/lib/trunnel/CodeGen.py index 047a078..038cdd8 100644 --- a/lib/trunnel/CodeGen.py +++ b/lib/trunnel/CodeGen.py @@ -885,7 +885,7 @@ class PrototypeGenerationVisitor(CodeGenerator): was not long enough, and -1 if the input was invalid.""" % (name)) self.w( - "ssize_t %s_encode(uint8_t *output, const size_t avail, const %s_t *input%s);\n" % + "ssize_t %s_encode(uint8_t *output, size_t avail, const %s_t *input%s);\n" % (name, name, contextFormals)) self.docstring("""Check whether the internal state of the %s in

1 0

[tor/master] Use tabs in src/or/include.am
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit fe4c0a187dcc6ec8a14175dfc4c62334221d4239 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 18 04:30:02 2015 +0200 Use tabs in src/or/include.am --- src/or/include.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/include.am b/src/or/include.am index af33365..5566d3c 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -49,7 +49,7 @@ LIBTOR_A_SOURCES = \ src/or/dirvote.c \ src/or/dns.c \ src/or/dnsserv.c \ - src/or/fp_pair.c \ + src/or/fp_pair.c \ src/or/geoip.c \ src/or/entrynodes.c \ src/or/ext_orport.c \ @@ -94,9 +94,9 @@ AM_CPPFLAGS += -I$(srcdir)/src/or -Isrc/or src/or/tor_main.o: micro-revision.i -AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ - -DLOCALSTATEDIR="\"$(localstatedir)\"" \ - -DBINDIR="\"$(bindir)\"" +AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ + -DLOCALSTATEDIR="\"$(localstatedir)\"" \ + -DBINDIR="\"$(bindir)\"" src_or_libtor_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_or_libtor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)

1 0

[tor/master] Fix typo in double_digest_map type
by nickm＠torproject.org 18 Aug '15

18 Aug '15

commit 63db8170ae3e70b161210241187d21bef72fbf40 Author: Sebastian Hahn <snsehahn(a)cip.cs.fau.de> Date: Fri Aug 14 02:12:35 2015 +0200 Fix typo in double_digest_map type --- src/or/dircollate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/dircollate.c b/src/or/dircollate.c index 331e058..4c812c4 100644 --- a/src/or/dircollate.c +++ b/src/or/dircollate.c @@ -23,7 +23,7 @@ typedef struct ddmap_entry_s { vote_routerstatus_t *vrs_lst[FLEXIBLE_ARRAY_MEMBER]; } ddmap_entry_t; -struct double_digest_map_s *by_both_ids; +double_digest_map_t *by_both_ids; static void ddmap_entry_free(ddmap_entry_t *e)

1 0