tor-commits November 2014

tor-commits@lists.torproject.org

24 participants
954 discussions

[tor/master] Fix a 64-bit clang warning
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 0e0dc7d787ef867a24b2e630bf1db72227b24fef Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 27 22:42:03 2014 -0500 Fix a 64-bit clang warning --- src/or/channeltls.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 719a153..90ad1e6 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -741,7 +741,7 @@ static int channel_tls_num_cells_writeable_method(channel_t *chan) { size_t outbuf_len; - int n; + ssize_t n; channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan); size_t cell_network_size; @@ -753,8 +753,11 @@ channel_tls_num_cells_writeable_method(channel_t *chan) /* Get the number of cells */ n = CEIL_DIV(OR_CONN_HIGHWATER - outbuf_len, cell_network_size); if (n < 0) n = 0; +#if SIZEOF_SIZE_T > SIZEOF_INT + if (n > INT_MAX) n = INT_MAX; +#endif - return n; + return (int)n; } /**

1 0

[tor/master] Make queue thresholds and flush size for global scheduler into config options
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 12b6c7df4aaf3224bc5649ef69a06dccc58ae961 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Oct 7 09:53:57 2014 -0700 Make queue thresholds and flush size for global scheduler into config options --- src/or/config.c | 22 ++++++++++++++++++++++ src/or/or.h | 13 +++++++++++++ src/or/scheduler.c | 38 +++++++++++++++++++++++++++++--------- src/or/scheduler.h | 3 +++ 4 files changed, 67 insertions(+), 9 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 86d7c6e..c124372 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -367,6 +367,9 @@ static config_var_t option_vars_[] = { V(ServerDNSSearchDomains, BOOL, "0"), V(ServerDNSTestAddresses, CSV, "www.google.com,www.mit.edu,www.yahoo.com,www.slashdot.org"), + V(SchedulerLowWaterMark, MEMUNIT, "16 kB"), + V(SchedulerHighWaterMark, MEMUNIT, "32 kB"), + V(SchedulerMaxFlushCells, UINT, "16"), V(ShutdownWaitLength, INTERVAL, "30 seconds"), V(SocksListenAddress, LINELIST, NULL), V(SocksPolicy, LINELIST, NULL), @@ -1522,6 +1525,25 @@ options_act(const or_options_t *old_options) return -1; } + /* Set up scheduler thresholds */ + if (options->SchedulerLowWaterMark > 0 && + options->SchedulerHighWaterMark > options->SchedulerLowWaterMark) { + scheduler_set_watermarks(options->SchedulerLowWaterMark, + options->SchedulerHighWaterMark, + (options->SchedulerMaxFlushCells > 0) ? + options->SchedulerMaxFlushCells : 16); + } else { + if (options->SchedulerLowWaterMark == 0) { + log_warn(LD_GENERAL, "Bad SchedulerLowWaterMark option"); + } + + if (options->SchedulerHighWaterMark <= options->SchedulerLowWaterMark) { + log_warn(LD_GENERAL, "Bad SchedulerHighWaterMark option"); + } + + return -1; + } + /* Set up accounting */ if (accounting_parse_options(options, 0)<0) { log_warn(LD_CONFIG,"Error in accounting options"); diff --git a/src/or/or.h b/src/or/or.h index 320931d..25df54a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4229,6 +4229,19 @@ typedef struct { /** Should we send the timestamps that pre-023 hidden services want? */ int Support022HiddenServices; + + /** Low-water mark for global scheduler - start sending when estimated + * queued size falls below this threshold. + */ + uint32_t SchedulerLowWaterMark; + /** High-water mark for global scheduler - stop sending when estimated + * queued size exceeds this threshold. + */ + uint32_t SchedulerHighWaterMark; + /** Flush size for global scheduler - flush this many cells at a time + * when sending. + */ + unsigned int SchedulerMaxFlushCells; } or_options_t; /** Persistent state for an onion router, as saved to disk. */ diff --git a/src/or/scheduler.c b/src/or/scheduler.c index c161393..c2ede84 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -21,16 +21,20 @@ #include <event.h> #endif -#define SCHED_Q_LOW_WATER 16384 -#define SCHED_Q_HIGH_WATER (2 * SCHED_Q_LOW_WATER) +/* + * Scheduler high/low watermarks + */ + +static uint32_t sched_q_low_water = 16384; +static uint32_t sched_q_high_water = 32768; /* * Maximum cells to flush in a single call to channel_flush_some_cells(); * setting this low means more calls, but too high and we could overshoot - * SCHED_Q_HIGH_WATER. + * sched_q_high_water. */ -#define SCHED_MAX_FLUSH_CELLS 16 +static uint32_t sched_max_flush_cells = 16; /* * Write scheduling works by keeping track of which channels can @@ -343,7 +347,7 @@ scheduler_more_work(void) { tor_assert(channels_pending); - return ((scheduler_get_queue_heuristic() < SCHED_Q_LOW_WATER) && + return ((scheduler_get_queue_heuristic() < sched_q_low_water) && ((smartlist_len(channels_pending) > 0))) ? 1 : 0; } @@ -387,12 +391,12 @@ scheduler_run, (void)) log_debug(LD_SCHED, "We have a chance to run the scheduler"); - if (scheduler_get_queue_heuristic() < SCHED_Q_LOW_WATER) { + if (scheduler_get_queue_heuristic() < sched_q_low_water) { n_chans_before = smartlist_len(channels_pending); q_len_before = channel_get_global_queue_estimate(); q_heur_before = scheduler_get_queue_heuristic(); - while (scheduler_get_queue_heuristic() <= SCHED_Q_HIGH_WATER && + while (scheduler_get_queue_heuristic() <= sched_q_high_water && smartlist_len(channels_pending) > 0) { /* Pop off a channel */ chan = smartlist_pqueue_pop(channels_pending, @@ -410,10 +414,10 @@ scheduler_run, (void)) flushed = 0; while (flushed < n_cells && - scheduler_get_queue_heuristic() <= SCHED_Q_HIGH_WATER) { + scheduler_get_queue_heuristic() <= sched_q_high_water) { flushed_this_time = channel_flush_some_cells(chan, - MIN(SCHED_MAX_FLUSH_CELLS, + MIN(sched_max_flush_cells, n_cells - flushed)); if (flushed_this_time <= 0) break; flushed += flushed_this_time; @@ -686,3 +690,19 @@ scheduler_update_queue_heuristic(time_t now) /* else no update needed, or time went backward */ } +/** + * Set scheduler watermarks and flush size + */ + +void +scheduler_set_watermarks(uint32_t lo, uint32_t hi, uint32_t max_flush) +{ + /* Sanity assertions - caller should ensure these are true */ + tor_assert(lo > 0); + tor_assert(hi > lo); + tor_assert(max_flush > 0); + + sched_q_low_water = lo; + sched_q_high_water = hi; + sched_max_flush_cells = max_flush; +} diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 8854d5a..404776b 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -34,6 +34,9 @@ void scheduler_adjust_queue_size(channel_t *chan, char dir, uint64_t adj); /* Notify scheduler that a channel's queue position may have changed */ void scheduler_touch_channel(channel_t *chan); +/* Adjust the watermarks from config file*/ +void scheduler_set_watermarks(uint32_t lo, uint32_t hi, uint32_t max_flush); + /* Things only scheduler.c and its test suite should see */ #ifdef SCHEDULER_PRIVATE_

1 0

[tor/master] One more, appease "make check-spaces"
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit e2641484a72c342ad6313eea135709f21c3a225a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 27 22:57:04 2014 -0500 One more, appease "make check-spaces" --- src/or/main.c | 1 - src/or/scheduler.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 64ccbd4..e78e9bf 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -224,7 +224,6 @@ set_buffer_lengths_to_zero(tor_socket_t s) } #endif - /** Return 1 if we have successfully built a circuit, and nothing has changed * to make us think that maybe we can't. */ diff --git a/src/or/scheduler.c b/src/or/scheduler.c index c2ede84..61f69b3 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -706,3 +706,4 @@ scheduler_set_watermarks(uint32_t lo, uint32_t hi, uint32_t max_flush) sched_q_high_water = hi; sched_max_flush_cells = max_flush; } +

1 0

[tor/master] Make circuitmux_num_cells() mockable
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 5b7a58f7c43c98c1f1fbb6bc347263c5247a5ab7 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Jan 22 01:00:25 2014 -0800 Make circuitmux_num_cells() mockable --- src/or/circuitmux.c | 4 ++-- src/or/circuitmux.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 29c3be1..71bc4ef 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -896,8 +896,8 @@ circuitmux_num_cells_for_circuit(circuitmux_t *cmux, circuit_t *circ) * Query total number of available cells on a circuitmux */ -unsigned int -circuitmux_num_cells(circuitmux_t *cmux) +MOCK_IMPL(unsigned int, +circuitmux_num_cells, (circuitmux_t *cmux)) { tor_assert(cmux); diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index 5833ee5..9a5ea7d 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -120,7 +120,7 @@ int circuitmux_is_circuit_attached(circuitmux_t *cmux, circuit_t *circ); int circuitmux_is_circuit_active(circuitmux_t *cmux, circuit_t *circ); unsigned int circuitmux_num_cells_for_circuit(circuitmux_t *cmux, circuit_t *circ); -unsigned int circuitmux_num_cells(circuitmux_t *cmux); +MOCK_DECL(unsigned int, circuitmux_num_cells, (circuitmux_t *cmux)); unsigned int circuitmux_num_circuits(circuitmux_t *cmux); unsigned int circuitmux_num_active_circuits(circuitmux_t *cmux);

1 0

[tor/master] Check queueing case in channel/flushmux unit test too
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 9740a07b8c5b2608f0a937799f9e24ce0f468de7 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Jan 22 02:33:27 2014 -0800 Check queueing case in channel/flushmux unit test too --- src/test/test_channel.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 2f5e946..588f698 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -481,7 +481,7 @@ static void test_channel_flushmux(void *arg) { channel_t *ch = NULL; - int old_count; + int old_count, q_len_before, q_len_after; ssize_t result; (void)arg; @@ -512,6 +512,28 @@ test_channel_flushmux(void *arg) test_eq(test_cells_written, old_count + 1); test_eq(test_cmux_cells, 0); + /* Now try it without accepting to force them into the queue */ + test_chan_accept_cells = 0; + test_cmux_cells = 1; + q_len_before = chan_cell_queue_len(&(ch->outgoing_queue)); + + result = channel_flush_some_cells(ch, 1); + + /* We should not have actually flushed any */ + test_eq(result, 0); + test_eq(test_cells_written, old_count + 1); + /* But we should have gotten to the fake cellgen loop */ + test_eq(test_cmux_cells, 0); + /* ...and we should have a queued cell */ + q_len_after = chan_cell_queue_len(&(ch->outgoing_queue)); + test_eq(q_len_after, q_len_before + 1); + + /* Now accept cells again and drain the queue */ + test_chan_accept_cells = 1; + channel_flush_cells(ch); + test_eq(test_cells_written, old_count + 2); + test_eq(chan_cell_queue_len(&(ch->outgoing_queue)), 0); + test_target_cmux = NULL; test_cmux_cells = 0;

1 0

[tor/master] Add channel/flushmux unit test
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit f12f7159a53f191a981104bae3f87d65a581e1f8 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Jan 22 02:11:59 2014 -0800 Add channel/flushmux unit test --- src/test/test_channel.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 18746df..2f5e946 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -32,7 +32,12 @@ static int test_doesnt_want_writes_count = 0; static int test_has_waiting_cells_count = 0; static double test_overhead_estimate = 1.0f; static int test_releases_count = 0; +static circuitmux_t *test_target_cmux = NULL; +static unsigned int test_cmux_cells = 0; +static int chan_test_channel_flush_from_first_active_circuit_mock( + channel_t *chan, int max); +static unsigned int chan_test_circuitmux_num_cells_mock(circuitmux_t *cmux); static void channel_note_destroy_not_pending_mock(channel_t *ch, circid_t circid); static void chan_test_cell_handler(channel_t *ch, @@ -51,6 +56,7 @@ static int chan_test_write_var_cell(channel_t *ch, var_cell_t *var_cell); static void scheduler_channel_doesnt_want_writes_mock(channel_t *ch); static void test_channel_flush(void *arg); +static void test_channel_flushmux(void *arg); static void test_channel_incoming(void *arg); static void test_channel_lifecycle(void *arg); static void test_channel_multi(void *arg); @@ -67,6 +73,62 @@ channel_note_destroy_not_pending_mock(channel_t *ch, ++test_destroy_not_pending_calls; } +/** + * If the target cmux is the cmux for chan, make fake cells up to the + * target number of cells and write them to chan. Otherwise, invoke + * the real channel_flush_from_first_active_circuit(). + */ + +static int +chan_test_channel_flush_from_first_active_circuit_mock(channel_t *chan, + int max) +{ + int result = 0, c = 0; + packed_cell_t *cell = NULL; + + test_assert(chan != NULL); + if (test_target_cmux != NULL && + test_target_cmux == chan->cmux) { + while (c <= max && test_cmux_cells > 0) { + cell = packed_cell_new(); + channel_write_packed_cell(chan, cell); + ++c; + --test_cmux_cells; + } + result = c; + } else { + result = channel_flush_from_first_active_circuit__real(chan, max); + } + + done: + return result; +} + +/** + * If we have a target cmux set and this matches it, lie about how + * many cells we have according to the number indicated; otherwise + * pass to the real circuitmux_num_cells(). + */ + +static unsigned int +chan_test_circuitmux_num_cells_mock(circuitmux_t *cmux) +{ + unsigned int result = 0; + + test_assert(cmux != NULL); + if (cmux != NULL) { + if (cmux == test_target_cmux) { + result = test_cmux_cells; + } else { + result = circuitmux_num_cells__real(cmux); + } + } + + done: + + return result; +} + /* * Handle an incoming fixed-size cell for unit tests */ @@ -411,6 +473,61 @@ test_channel_flush(void *arg) return; } +/** + * Channel flush tests that require cmux mocking + */ + +static void +test_channel_flushmux(void *arg) +{ + channel_t *ch = NULL; + int old_count; + ssize_t result; + + (void)arg; + + init_cell_pool(); + + /* Install mocks we need for this test */ + MOCK(channel_flush_from_first_active_circuit, + chan_test_channel_flush_from_first_active_circuit_mock); + MOCK(circuitmux_num_cells, + chan_test_circuitmux_num_cells_mock); + + ch = new_fake_channel(); + test_assert(ch); + ch->cmux = circuitmux_alloc(); + + old_count = test_cells_written; + + test_target_cmux = ch->cmux; + test_cmux_cells = 1; + + /* Enable cell acceptance */ + test_chan_accept_cells = 1; + + result = channel_flush_some_cells(ch, 1); + + test_eq(result, 1); + test_eq(test_cells_written, old_count + 1); + test_eq(test_cmux_cells, 0); + + test_target_cmux = NULL; + test_cmux_cells = 0; + + done: + tor_free(ch); + + UNMOCK(channel_flush_from_first_active_circuit); + UNMOCK(circuitmux_num_cells); + + test_chan_accept_cells = 0; + + free_cell_pool(); + + return; +} + static void test_channel_incoming(void *arg) { @@ -1291,6 +1408,7 @@ test_channel_write(void *arg) struct testcase_t channel_tests[] = { { "flush", test_channel_flush, TT_FORK, NULL, NULL }, + { "flushmux", test_channel_flushmux, TT_FORK, NULL, NULL }, { "incoming", test_channel_incoming, TT_FORK, NULL, NULL }, { "lifecycle", test_channel_lifecycle, TT_FORK, NULL, NULL }, { "lifecycle_2", test_channel_lifecycle_2, TT_FORK, NULL, NULL },

1 0

[tor/master] Initial test_channeltls.c
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 50d5fb87bd6e763895eb0a784e4dbb40a132b759 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Jan 22 16:51:44 2014 -0800 Initial test_channeltls.c --- src/test/Makefile.nmake | 6 +++--- src/test/include.am | 1 + src/test/test.c | 2 ++ src/test/test_channeltls.c | 18 ++++++++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake index 2a347bd..7986eb0 100644 --- a/src/test/Makefile.nmake +++ b/src/test/Makefile.nmake @@ -11,9 +11,9 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \ ws2_32.lib advapi32.lib shell32.lib \ crypt32.lib gdi32.lib user32.lib -TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_containers.obj \ - test_controller_events.ogj test_crypto.obj test_data.obj test_dir.obj \ - test_microdesc.obj test_pt.obj test_util.obj test_config.obj \ +TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_channeltls.obj \ + test_containers.obj test_controller_events.obj test_crypto.obj test_data.obj \ + test_dir.obj test_microdesc.obj test_pt.obj test_util.obj test_config.obj \ test_cell_formats.obj test_relay.obj test_replay.obj \ test_introduce.obj tinytest.obj test_hs.obj diff --git a/src/test/include.am b/src/test/include.am index 531b81e..fdd88db 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -21,6 +21,7 @@ src_test_test_SOURCES = \ src/test/test_buffers.c \ src/test/test_cell_formats.c \ src/test/test_channel.c \ + src/test/test_channeltls.c \ src/test/test_circuitlist.c \ src/test/test_circuitmux.c \ src/test/test_containers.c \ diff --git a/src/test/test.c b/src/test/test.c index 7ade83d..d0f0041 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1310,6 +1310,7 @@ extern struct testcase_t status_tests[]; extern struct testcase_t routerset_tests[]; extern struct testcase_t router_tests[]; extern struct testcase_t channel_tests[]; +extern struct testcase_t channeltls_tests[]; extern struct testcase_t relay_tests[]; static struct testgroup_t testgroups[] = { @@ -1344,6 +1345,7 @@ static struct testgroup_t testgroups[] = { { "status/" , status_tests }, { "routerset/" , routerset_tests }, { "channel/", channel_tests }, + { "channeltls/", channeltls_tests }, { "relay/" , relay_tests }, END_OF_GROUPS }; diff --git a/src/test/test_channeltls.c b/src/test/test_channeltls.c new file mode 100644 index 0000000..6284cc0 --- /dev/null +++ b/src/test/test_channeltls.c @@ -0,0 +1,18 @@ +/* Copyright (c) 2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#define TOR_CHANNEL_INTERNAL_ +#include "or.h" +#include "channel.h" +#include "channeltls.h" +/* For init/free stuff */ +#include "scheduler.h" + +/* Test suite stuff */ +#include "test.h" +#include "fakechans.h" + +struct testcase_t channeltls_tests[] = { + END_OF_TESTCASES +}; +

1 0

[tor/master] Make channel_flush_from_first_active_circuit() mockable
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 9eea42f844801f673b90788ff4f5389b300d81fb Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Jan 22 01:04:39 2014 -0800 Make channel_flush_from_first_active_circuit() mockable --- src/or/relay.c | 4 ++-- src/or/relay.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index b653616..fee2eec 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2592,8 +2592,8 @@ packed_cell_get_circid(const packed_cell_t *cell, int wide_circ_ids) * queue of the first active circuit on <b>chan</b>, and write them to * <b>chan</b>->outbuf. Return the number of cells written. Advance * the active circuit pointer to the next active circuit in the ring. */ -int -channel_flush_from_first_active_circuit(channel_t *chan, int max) +MOCK_IMPL(int, +channel_flush_from_first_active_circuit, (channel_t *chan, int max)) { circuitmux_t *cmux = NULL; int n_flushed = 0; diff --git a/src/or/relay.h b/src/or/relay.h index 969c6fb..68b4fdf 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -64,7 +64,8 @@ void append_cell_to_circuit_queue(circuit_t *circ, channel_t *chan, cell_t *cell, cell_direction_t direction, streamid_t fromstream); void channel_unlink_all_circuits(channel_t *chan, smartlist_t *detached_out); -int channel_flush_from_first_active_circuit(channel_t *chan, int max); +MOCK_DECL(int, channel_flush_from_first_active_circuit, + (channel_t *chan, int max)); void assert_circuit_mux_okay(channel_t *chan); void update_circuit_on_cmux_(circuit_t *circ, cell_direction_t direction, const char *file, int lineno);

1 0

[tor/master] Make channel_dump_statistics() mockable
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 452bce6c7200600d4810f490ba5cc1c93d49cc96 Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Jan 22 03:51:22 2014 -0800 Make channel_dump_statistics() mockable --- src/or/channel.c | 4 ++-- src/or/channel.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 94cca5c..ec44cce 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -3450,8 +3450,8 @@ chan_cell_queue_len(const chan_cell_queue_t *queue) * Dump statistics for one channel to the log */ -void -channel_dump_statistics(channel_t *chan, int severity) +MOCK_IMPL(void, +channel_dump_statistics, (channel_t *chan, int severity)) { double avg, interval, age; time_t now = time(NULL); diff --git a/src/or/channel.h b/src/or/channel.h index ba6d66b..07a66eb 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -506,7 +506,7 @@ channel_t * channel_next_with_digest(channel_t *chan); */ const char * channel_describe_transport(channel_t *chan); -void channel_dump_statistics(channel_t *chan, int severity); +MOCK_DECL(void, channel_dump_statistics, (channel_t *chan, int severity)); void channel_dump_transport_statistics(channel_t *chan, int severity); const char * channel_get_actual_remote_descr(channel_t *chan); const char * channel_get_actual_remote_address(channel_t *chan);

1 0

[tor/master] Add channel/dumpstats unit test
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 5ee25cc185cf7d91c5147faf5dc92b6b305c16ee Author: Andrea Shepard <andrea(a)torproject.org> Date: Wed Jan 22 04:10:15 2014 -0800 Add channel/dumpstats unit test --- src/test/test_channel.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 588f698..fc0ef3d 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -34,7 +34,11 @@ static double test_overhead_estimate = 1.0f; static int test_releases_count = 0; static circuitmux_t *test_target_cmux = NULL; static unsigned int test_cmux_cells = 0; +static channel_t *dump_statistics_mock_target = NULL; +static int dump_statistics_mock_matches = 0; +static void chan_test_channel_dump_statistics_mock( + channel_t *chan, int severity); static int chan_test_channel_flush_from_first_active_circuit_mock( channel_t *chan, int max); static unsigned int chan_test_circuitmux_num_cells_mock(circuitmux_t *cmux); @@ -55,6 +59,7 @@ static int chan_test_write_packed_cell(channel_t *ch, static int chan_test_write_var_cell(channel_t *ch, var_cell_t *var_cell); static void scheduler_channel_doesnt_want_writes_mock(channel_t *ch); +static void test_channel_dumpstats(void *arg); static void test_channel_flush(void *arg); static void test_channel_flushmux(void *arg); static void test_channel_incoming(void *arg); @@ -74,6 +79,26 @@ channel_note_destroy_not_pending_mock(channel_t *ch, } /** + * Mock for channel_dump_statistics(); if the channel matches the + * target, bump a counter - otherwise ignore. + */ + +static void +chan_test_channel_dump_statistics_mock(channel_t *chan, int severity) +{ + test_assert(chan != NULL); + + (void)severity; + + if (chan != NULL && chan == dump_statistics_mock_target) { + ++dump_statistics_mock_matches; + } + + done: + return; +} + +/** * If the target cmux is the cmux for chan, make fake cells up to the * target number of cells and write them to chan. Otherwise, invoke * the real channel_flush_from_first_active_circuit(). @@ -414,6 +439,75 @@ scheduler_release_channel_mock(channel_t *ch) return; } +/** + * Test for channel_dumpstats() + */ + +static void +test_channel_dumpstats(void *arg) +{ + channel_t *ch = NULL; + + (void)arg; + + /* Mock these for duration of the test */ + MOCK(scheduler_channel_doesnt_want_writes, + scheduler_channel_doesnt_want_writes_mock); + MOCK(scheduler_release_channel, + scheduler_release_channel_mock); + + /* Set up a new fake channel */ + ch = new_fake_channel(); + test_assert(ch); + ch->cmux = circuitmux_alloc(); + + /* Try to register it */ + channel_register(ch); + test_assert(ch->registered); + + /* Set up mock */ + dump_statistics_mock_target = ch; + dump_statistics_mock_matches = 0; + MOCK(channel_dump_statistics, + chan_test_channel_dump_statistics_mock); + + /* Call channel_dumpstats() */ + channel_dumpstats(LOG_DEBUG); + + /* Assert that we hit the mock */ + test_eq(dump_statistics_mock_matches, 1); + + /* Close the channel */ + channel_mark_for_close(ch); + test_eq(ch->state, CHANNEL_STATE_CLOSING); + chan_test_finish_close(ch); + test_eq(ch->state, CHANNEL_STATE_CLOSED); + + /* Try again and hit the finished channel */ + channel_dumpstats(LOG_DEBUG); + test_eq(dump_statistics_mock_matches, 2); + + channel_run_cleanup(); + ch = NULL; + + /* Now we should hit nothing */ + channel_dumpstats(LOG_DEBUG); + test_eq(dump_statistics_mock_matches, 2); + + /* Unmock */ + UNMOCK(channel_dump_statistics); + dump_statistics_mock_target = NULL; + dump_statistics_mock_matches = 0; + + done: + tor_free(ch); + + UNMOCK(scheduler_channel_doesnt_want_writes); + UNMOCK(scheduler_release_channel); + + return; +} + static void test_channel_flush(void *arg) { @@ -1429,6 +1523,7 @@ test_channel_write(void *arg) } struct testcase_t channel_tests[] = { + { "dumpstats", test_channel_dumpstats, TT_FORK, NULL, NULL }, { "flush", test_channel_flush, TT_FORK, NULL, NULL }, { "flushmux", test_channel_flushmux, TT_FORK, NULL, NULL }, { "incoming", test_channel_incoming, TT_FORK, NULL, NULL },

1 0

← Newer
1
2
3
4
5
6
7
8
...
96
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2014