tor-commits November 2014

tor-commits@lists.torproject.org

24 participants
954 discussions

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

28 Nov '14

commit 0af88f909661b8fd2987beb839c78b804212abc7 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jan 23 20:55:34 2014 -0800 Initial test_scheduler.c --- src/test/Makefile.nmake | 8 +-- src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_scheduler.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 4 deletions(-) diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake index 7986eb0..e2cf538 100644 --- a/src/test/Makefile.nmake +++ b/src/test/Makefile.nmake @@ -12,10 +12,10 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \ crypt32.lib gdi32.lib user32.lib 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 + 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_scheduler.obj test_introduce.obj test_hs.obj tinytest.obj tinytest.obj: ..\ext\tinytest.c $(CC) $(CFLAGS) /D snprintf=_snprintf /c ..\ext\tinytest.c diff --git a/src/test/include.am b/src/test/include.am index fdd88db..5a8652b 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -42,6 +42,7 @@ src_test_test_SOURCES = \ src/test/test_relay.c \ src/test/test_replay.c \ src/test/test_routerkeys.c \ + src/test/test_scheduler.c \ src/test/test_socks.c \ src/test/test_util.c \ src/test/test_config.c \ diff --git a/src/test/test.c b/src/test/test.c index d0f0041..8d45ef0 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1312,6 +1312,7 @@ extern struct testcase_t router_tests[]; extern struct testcase_t channel_tests[]; extern struct testcase_t channeltls_tests[]; extern struct testcase_t relay_tests[]; +extern struct testcase_t scheduler_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -1347,6 +1348,7 @@ static struct testgroup_t testgroups[] = { { "channel/", channel_tests }, { "channeltls/", channeltls_tests }, { "relay/" , relay_tests }, + { "scheduler/", scheduler_tests }, END_OF_GROUPS }; diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c new file mode 100644 index 0000000..e8bceeb --- /dev/null +++ b/src/test/test_scheduler.c @@ -0,0 +1,141 @@ +/* Copyright (c) 2014, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include <math.h> + +#include "orconfig.h" + +/* Libevent stuff */ +#ifdef HAVE_EVENT2_EVENT_H +#include <event2/event.h> +#else +#include <event.h> +#endif + +#define TOR_CHANNEL_INTERNAL_ +#include "or.h" +#include "compat_libevent.h" +#include "scheduler.h" + +/* Test suite stuff */ +#include "test.h" + +/* Statics in scheduler.c exposed to the test suite */ +extern smartlist_t *channels_pending; +extern struct event *run_sched_ev; +extern uint64_t queue_heuristic; +extern time_t queue_heuristic_timestamp; + +/* Event base for scheduelr tests */ +static struct event_base *mock_event_base = NULL; + +/* Setup for mock event stuff */ +static void mock_event_free_all(void); +static void mock_event_init(void); + +/* Mocks used by scheduler tests */ +static struct event_base * tor_libevent_get_base_mock(void); + +/* Scheduler test cases */ +static void test_scheduler_initfree(void *arg); + +/* Mock event init/free */ + +/* Shamelessly stolen from compat_libevent.c */ +#define V(major, minor, patch) \ + (((major) << 24) | ((minor) << 16) | ((patch) << 8)) + +static void +mock_event_free_all(void) +{ + test_assert(mock_event_base != NULL); + + if (mock_event_base) { + event_base_free(mock_event_base); + mock_event_base = NULL; + } + + test_eq(mock_event_base, NULL); + + done: + return; +} + +static void +mock_event_init(void) +{ +#ifdef HAVE_EVENT2_EVENT_H + struct event_config *cfg = NULL; +#endif + + test_eq(mock_event_base, NULL); + + /* + * Really cut down from tor_libevent_initialize of + * src/common/compat_libevent.c to kill config dependencies + */ + + if (!mock_event_base) { +#ifdef HAVE_EVENT2_EVENT_H + cfg = event_config_new(); +#if LIBEVENT_VERSION_NUMBER >= V(2,0,9) + /* We can enable changelist support with epoll, since we don't give + * Libevent any dup'd fds. This lets us avoid some syscalls. */ + event_config_set_flag(cfg, EVENT_BASE_FLAG_EPOLL_USE_CHANGELIST); +#endif + mock_event_base = event_base_new_with_config(cfg); + event_config_free(cfg); +#else + mock_event_base = event_init(); +#endif + } + + test_assert(mock_event_base != NULL); + + done: + return; +} + +/* Mocks */ + +static struct event_base * +tor_libevent_get_base_mock(void) +{ + return mock_event_base; +} + +/* Test cases */ + +static void +test_scheduler_initfree(void *arg) +{ + (void)arg; + + test_eq(channels_pending, NULL); + test_eq(run_sched_ev, NULL); + + mock_event_init(); + MOCK(tor_libevent_get_base, tor_libevent_get_base_mock); + + scheduler_init(); + + test_assert(channels_pending != NULL); + test_assert(run_sched_ev != NULL); + + scheduler_free_all(); + + UNMOCK(tor_libevent_get_base); + mock_event_free_all(); + + test_eq(channels_pending, NULL); + test_eq(run_sched_ev, NULL); + + done: + return; +} + +struct testcase_t scheduler_tests[] = { + { "initfree", test_scheduler_initfree, TT_FORK, NULL, NULL }, + END_OF_TESTCASES +}; +

1 0

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

28 Nov '14

commit f8ceb0f028eb7661cb31b2f82d5a82460e96ece9 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jan 24 07:03:14 2014 -0800 Make scheduler_run() mockable --- src/or/scheduler.c | 4 ++-- src/or/scheduler.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 544ec83..bf86810 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -376,8 +376,8 @@ scheduler_release_channel,(channel_t *chan)) /** Run the scheduling algorithm if necessary */ -void -scheduler_run(void) +MOCK_IMPL(void, +scheduler_run, (void)) { int n_cells, n_chans_before, n_chans_after; uint64_t q_len_before, q_heur_before, q_len_after, q_heur_after; diff --git a/src/or/scheduler.h b/src/or/scheduler.h index b99491b..b0b66ee 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -18,7 +18,7 @@ /* Set up and shut down the scheduler from main.c */ void scheduler_free_all(void); void scheduler_init(void); -void scheduler_run(void); +MOCK_DECL(void, scheduler_run, (void)); /* Mark channels as having cells or wanting/not wanting writes */ MOCK_DECL(void,scheduler_channel_doesnt_want_writes,(channel_t *chan));

1 0

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

28 Nov '14

commit dc3af04ba8c65e1217f834f04be2a055e8084ec8 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Jan 28 17:25:37 2014 -0800 Make scheduler_compare_channels() mockable --- src/or/scheduler.c | 4 ++-- src/or/scheduler.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index bf86810..c161393 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -167,8 +167,8 @@ scheduler_free_all(void) * Comparison function to use when sorting pending channels */ -STATIC int -scheduler_compare_channels(const void *c1_v, const void *c2_v) +MOCK_IMPL(STATIC int, +scheduler_compare_channels, (const void *c1_v, const void *c2_v)) { channel_t *c1 = NULL, *c2 = NULL; /* These are a workaround for -Wbad-function-cast throwing a fit */ diff --git a/src/or/scheduler.h b/src/or/scheduler.h index b0b66ee..8854d5a 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -37,7 +37,8 @@ void scheduler_touch_channel(channel_t *chan); /* Things only scheduler.c and its test suite should see */ #ifdef SCHEDULER_PRIVATE_ -STATIC int scheduler_compare_channels(const void *c1_v, const void *c2_v); +MOCK_DECL(STATIC int, scheduler_compare_channels, + (const void *c1_v, const void *c2_v)); STATIC uint64_t scheduler_get_queue_heuristic(void); STATIC void scheduler_update_queue_heuristic(time_t now); #endif

1 0

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

28 Nov '14

commit 684bcd886abb36414a1499ced1b038050f6face1 Author: Andrea Shepard <andrea(a)torproject.org> Date: Tue Jan 28 17:34:16 2014 -0800 Add scheduler channel states unit test --- src/test/test_scheduler.c | 153 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 150 insertions(+), 3 deletions(-) diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index e40df16..650d4f1 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -41,6 +41,8 @@ static circuitmux_t *mock_cgp_tgt_1 = NULL; static const circuitmux_policy_t *mock_cgp_val_1 = NULL; static circuitmux_t *mock_cgp_tgt_2 = NULL; static const circuitmux_policy_t *mock_cgp_val_2 = NULL; +static int scheduler_compare_channels_mock_ctr = 0; +static int scheduler_run_mock_ctr = 0; /* Setup for mock event stuff */ static void mock_event_free_all(void); @@ -51,9 +53,13 @@ static int circuitmux_compare_muxes_mock(circuitmux_t *cmux_1, circuitmux_t *cmux_2); static const circuitmux_policy_t * circuitmux_get_policy_mock( circuitmux_t *cmux); +static int scheduler_compare_channels_mock(const void *c1_v, + const void *c2_v); +static void scheduler_run_noop_mock(void); static struct event_base * tor_libevent_get_base_mock(void); /* Scheduler test cases */ +static void test_scheduler_channel_states(void *arg); static void test_scheduler_compare_channels(void *arg); static void test_scheduler_initfree(void *arg); static void test_scheduler_queue_heuristic(void *arg); @@ -130,8 +136,7 @@ circuitmux_compare_muxes_mock(circuitmux_t *cmux_1, if (cmux_1 == mock_ccm_tgt_1 && cmux_2 == mock_ccm_tgt_2) result = -1; else if (cmux_1 == mock_ccm_tgt_2 && cmux_2 == mock_ccm_tgt_1) { result = 1; - } - else { + } else { if (cmux_1 == mock_ccm_tgt_1 || cmux_1 == mock_ccm_tgt_1) result = -1; else if (cmux_2 == mock_ccm_tgt_1 || cmux_2 == mock_ccm_tgt_2) { result = 1; @@ -162,6 +167,28 @@ circuitmux_get_policy_mock(circuitmux_t *cmux) return result; } +static int +scheduler_compare_channels_mock(const void *c1_v, + const void *c2_v) +{ + uintptr_t p1, p2; + + p1 = (uintptr_t)(c1_v); + p2 = (uintptr_t)(c2_v); + + ++scheduler_compare_channels_mock_ctr; + + if (p1 == p2) return 0; + else if (p1 < p2) return 1; + else return -1; +} + +static void +scheduler_run_noop_mock(void) +{ + ++scheduler_run_mock_ctr; +} + static struct event_base * tor_libevent_get_base_mock(void) { @@ -171,6 +198,125 @@ tor_libevent_get_base_mock(void) /* Test cases */ static void +test_scheduler_channel_states(void *arg) +{ + channel_t *ch1 = NULL, *ch2 = NULL; + int old_count; + + (void)arg; + + /* Set up libevent and scheduler */ + + mock_event_init(); + MOCK(tor_libevent_get_base, tor_libevent_get_base_mock); + scheduler_init(); + /* + * Install the compare channels mock so we can test + * scheduler_touch_channel(). + */ + MOCK(scheduler_compare_channels, scheduler_compare_channels_mock); + /* + * Disable scheduler_run so we can just check the state transitions + * without having to make everything it might call work too. + */ + MOCK(scheduler_run, scheduler_run_noop_mock); + + test_eq(smartlist_len(channels_pending), 0); + + /* Set up a fake channel */ + ch1 = new_fake_channel(); + test_assert(ch1); + + /* Start it off in OPENING */ + ch1->state = CHANNEL_STATE_OPENING; + /* We'll need a cmux */ + ch1->cmux = circuitmux_alloc(); + /* Try to register it */ + channel_register(ch1); + test_assert(ch1->registered); + + /* It should start off in SCHED_CHAN_IDLE */ + test_eq(ch1->scheduler_state, SCHED_CHAN_IDLE); + + /* Now get another one */ + ch2 = new_fake_channel(); + test_assert(ch2); + ch2->state = CHANNEL_STATE_OPENING; + ch2->cmux = circuitmux_alloc(); + channel_register(ch2); + test_assert(ch2->registered); + + /* Send it to SCHED_CHAN_WAITING_TO_WRITE */ + scheduler_channel_has_waiting_cells(ch1); + test_eq(ch1->scheduler_state, SCHED_CHAN_WAITING_TO_WRITE); + + /* This should send it to SCHED_CHAN_PENDING */ + scheduler_channel_wants_writes(ch1); + test_eq(ch1->scheduler_state, SCHED_CHAN_PENDING); + test_eq(smartlist_len(channels_pending), 1); + + /* Now send ch2 to SCHED_CHAN_WAITING_FOR_CELLS */ + scheduler_channel_wants_writes(ch2); + test_eq(ch2->scheduler_state, SCHED_CHAN_WAITING_FOR_CELLS); + + /* Drop ch2 back to idle */ + scheduler_channel_doesnt_want_writes(ch2); + test_eq(ch2->scheduler_state, SCHED_CHAN_IDLE); + + /* ...and back to SCHED_CHAN_WAITING_FOR_CELLS */ + scheduler_channel_wants_writes(ch2); + test_eq(ch2->scheduler_state, SCHED_CHAN_WAITING_FOR_CELLS); + + /* ...and this should kick ch2 into SCHED_CHAN_PENDING */ + scheduler_channel_has_waiting_cells(ch2); + test_eq(ch2->scheduler_state, SCHED_CHAN_PENDING); + test_eq(smartlist_len(channels_pending), 2); + + /* This should send ch2 to SCHED_CHAN_WAITING_TO_WRITE */ + scheduler_channel_doesnt_want_writes(ch2); + test_eq(ch2->scheduler_state, SCHED_CHAN_WAITING_TO_WRITE); + test_eq(smartlist_len(channels_pending), 1); + + /* ...and back to SCHED_CHAN_PENDING */ + scheduler_channel_wants_writes(ch2); + test_eq(ch2->scheduler_state, SCHED_CHAN_PENDING); + test_eq(smartlist_len(channels_pending), 2); + + /* Now we exercise scheduler_touch_channel */ + old_count = scheduler_compare_channels_mock_ctr; + scheduler_touch_channel(ch1); + test_assert(scheduler_compare_channels_mock_ctr > old_count); + + /* Close */ + channel_mark_for_close(ch1); + test_eq(ch1->state, CHANNEL_STATE_CLOSING); + channel_mark_for_close(ch2); + test_eq(ch2->state, CHANNEL_STATE_CLOSING); + channel_closed(ch1); + test_eq(ch1->state, CHANNEL_STATE_CLOSED); + ch1 = NULL; + channel_closed(ch2); + test_eq(ch2->state, CHANNEL_STATE_CLOSED); + ch2 = NULL; + + /* Shut things down */ + + channel_free_all(); + scheduler_free_all(); + mock_event_free_all(); + + done: + tor_free(ch1); + tor_free(ch2); + + UNMOCK(scheduler_compare_channels); + UNMOCK(scheduler_run); + UNMOCK(tor_libevent_get_base); + + return; +} + +static void test_scheduler_compare_channels(void *arg) { /* We don't actually need whole fake channels... */ @@ -208,7 +354,7 @@ test_scheduler_compare_channels(void *arg) /* Equal-channel case */ result = scheduler_compare_channels(&c1, &c1); test_eq(result, 0); - + /* Distinct channels, distinct policies */ result = scheduler_compare_channels(&c1, &c2); test_eq(result, -1); @@ -303,6 +449,7 @@ test_scheduler_queue_heuristic(void *arg) } struct testcase_t scheduler_tests[] = { + { "channel_states", test_scheduler_channel_states, TT_FORK, NULL, NULL }, { "compare_channels", test_scheduler_compare_channels, TT_FORK, NULL, NULL }, { "initfree", test_scheduler_initfree, TT_FORK, NULL, NULL },

1 0

[tor/master] Expose scheduler_compare_channels() to test suite
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit b7125961de3e7d2687cc52d63d000ad6b6320d63 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jan 24 03:12:28 2014 -0800 Expose scheduler_compare_channels() to test suite --- src/or/scheduler.c | 3 +-- src/or/scheduler.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 1b4ae04..544ec83 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -134,7 +134,6 @@ STATIC time_t queue_heuristic_timestamp = 0; /* Scheduler static function declarations */ -static int scheduler_compare_channels(const void *c1_v, const void *c2_v); static void scheduler_evt_callback(evutil_socket_t fd, short events, void *arg); static int scheduler_more_work(void); @@ -168,7 +167,7 @@ scheduler_free_all(void) * Comparison function to use when sorting pending channels */ -static int +STATIC int scheduler_compare_channels(const void *c1_v, const void *c2_v) { channel_t *c1 = NULL, *c2 = NULL; diff --git a/src/or/scheduler.h b/src/or/scheduler.h index 3c0d86d..b99491b 100644 --- a/src/or/scheduler.h +++ b/src/or/scheduler.h @@ -37,6 +37,7 @@ void scheduler_touch_channel(channel_t *chan); /* Things only scheduler.c and its test suite should see */ #ifdef SCHEDULER_PRIVATE_ +STATIC int scheduler_compare_channels(const void *c1_v, const void *c2_v); STATIC uint64_t scheduler_get_queue_heuristic(void); STATIC void scheduler_update_queue_heuristic(time_t now); #endif

1 0

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

28 Nov '14

commit 5a07fb96f2a4072bd9ee31a887ac0c790fdaf6c4 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jan 23 20:54:50 2014 -0800 Make tor_libevent_get_base() mockable --- src/common/compat_libevent.c | 4 ++-- src/common/compat_libevent.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 74b54bb..6b2241a 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -280,8 +280,8 @@ tor_libevent_initialize(tor_libevent_cfg *torcfg) } /** Return the current Libevent event base that we're set up to use. */ -struct event_base * -tor_libevent_get_base(void) +MOCK_IMPL(struct event_base *, +tor_libevent_get_base, (void)) { return the_event_base; } diff --git a/src/common/compat_libevent.h b/src/common/compat_libevent.h index 9ee7b49..45d007f 100644 --- a/src/common/compat_libevent.h +++ b/src/common/compat_libevent.h @@ -72,7 +72,7 @@ typedef struct tor_libevent_cfg { } tor_libevent_cfg; void tor_libevent_initialize(tor_libevent_cfg *cfg); -struct event_base *tor_libevent_get_base(void); +MOCK_DECL(struct event_base *, tor_libevent_get_base, (void)); const char *tor_libevent_get_method(void); void tor_check_libevent_version(const char *m, int server, const char **badness_out);

1 0

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

28 Nov '14

commit c5f73e52e54a60581374ff6355104aea3e0f6233 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jan 24 03:10:55 2014 -0800 Make circuitmux_compare_muxes() and circuitmux_get_policy() mockable --- src/or/circuitmux.c | 8 ++++---- src/or/circuitmux.h | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c index 71bc4ef..7175b6b 100644 --- a/src/or/circuitmux.c +++ b/src/or/circuitmux.c @@ -621,8 +621,8 @@ circuitmux_clear_policy(circuitmux_t *cmux) * Return the policy currently installed on a circuitmux_t */ -const circuitmux_policy_t * -circuitmux_get_policy(circuitmux_t *cmux) +MOCK_IMPL(const circuitmux_policy_t *, +circuitmux_get_policy, (circuitmux_t *cmux)) { tor_assert(cmux); @@ -1961,8 +1961,8 @@ circuitmux_count_queued_destroy_cells(const channel_t *chan, * support the cmp_cmux method, return 0. */ -int -circuitmux_compare_muxes(circuitmux_t *cmux_1, circuitmux_t *cmux_2) +MOCK_IMPL(int, +circuitmux_compare_muxes, (circuitmux_t *cmux_1, circuitmux_t *cmux_2)) { const circuitmux_policy_t *policy; diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index 9a5ea7d..00707d9 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -108,7 +108,8 @@ void circuitmux_free(circuitmux_t *cmux); /* Policy control */ void circuitmux_clear_policy(circuitmux_t *cmux); -const circuitmux_policy_t * circuitmux_get_policy(circuitmux_t *cmux); +MOCK_DECL(const circuitmux_policy_t *, + circuitmux_get_policy, (circuitmux_t *cmux)); void circuitmux_set_policy(circuitmux_t *cmux, const circuitmux_policy_t *pol); @@ -152,7 +153,8 @@ void circuitmux_mark_destroyed_circids_usable(circuitmux_t *cmux, channel_t *chan); /* Optional interchannel comparisons for scheduling */ -int circuitmux_compare_muxes(circuitmux_t *cmux_1, circuitmux_t *cmux_2); +MOCK_DECL(int, circuitmux_compare_muxes, + (circuitmux_t *cmux_1, circuitmux_t *cmux_2)); #endif /* TOR_CIRCUITMUX_H */

1 0

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

28 Nov '14

commit 030608d68d393c90fb789638e5e93ac6af7d4f5e Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Jan 23 21:13:44 2014 -0800 Add scheduler/queue_heuristic unit test --- src/test/test_scheduler.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index e8bceeb..02426f3 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -15,6 +15,7 @@ #define TOR_CHANNEL_INTERNAL_ #include "or.h" #include "compat_libevent.h" +#define SCHEDULER_PRIVATE_ #include "scheduler.h" /* Test suite stuff */ @@ -134,8 +135,44 @@ test_scheduler_initfree(void *arg) return; } +static void +test_scheduler_queue_heuristic(void *arg) +{ + time_t now = approx_time(); + uint64_t qh; + + (void)arg; + + queue_heuristic = 0; + queue_heuristic_timestamp = 0; + + /* Not yet inited case */ + scheduler_update_queue_heuristic(now - 180); + test_eq(queue_heuristic, 0); + test_eq(queue_heuristic_timestamp, now - 180); + + queue_heuristic = 1000000000L; + queue_heuristic_timestamp = now - 120; + + scheduler_update_queue_heuristic(now - 119); + test_eq(queue_heuristic, 500000000L); + test_eq(queue_heuristic_timestamp, now - 119); + + scheduler_update_queue_heuristic(now - 116); + test_eq(queue_heuristic, 62500000L); + test_eq(queue_heuristic_timestamp, now - 116); + + qh = scheduler_get_queue_heuristic(); + test_eq(qh, 0); + + done: + return; +} + struct testcase_t scheduler_tests[] = { { "initfree", test_scheduler_initfree, TT_FORK, NULL, NULL }, + { "queue_heuristic", test_scheduler_queue_heuristic, + TT_FORK, NULL, NULL }, END_OF_TESTCASES };

1 0

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

28 Nov '14

commit 314c2f18ae53c73e790b815567d4c266a4b67382 Author: Andrea Shepard <andrea(a)torproject.org> Date: Fri Jan 24 04:33:59 2014 -0800 Add scheduler/compare_channels unit test --- src/test/test_scheduler.c | 135 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/src/test/test_scheduler.c b/src/test/test_scheduler.c index 02426f3..e40df16 100644 --- a/src/test/test_scheduler.c +++ b/src/test/test_scheduler.c @@ -13,13 +13,16 @@ #endif #define TOR_CHANNEL_INTERNAL_ +#define CHANNEL_PRIVATE_ #include "or.h" #include "compat_libevent.h" +#include "channel.h" #define SCHEDULER_PRIVATE_ #include "scheduler.h" /* Test suite stuff */ #include "test.h" +#include "fakechans.h" /* Statics in scheduler.c exposed to the test suite */ extern smartlist_t *channels_pending; @@ -30,15 +33,30 @@ extern time_t queue_heuristic_timestamp; /* Event base for scheduelr tests */ static struct event_base *mock_event_base = NULL; +/* Statics controlling mocks */ +static circuitmux_t *mock_ccm_tgt_1 = NULL; +static circuitmux_t *mock_ccm_tgt_2 = NULL; + +static circuitmux_t *mock_cgp_tgt_1 = NULL; +static const circuitmux_policy_t *mock_cgp_val_1 = NULL; +static circuitmux_t *mock_cgp_tgt_2 = NULL; +static const circuitmux_policy_t *mock_cgp_val_2 = NULL; + /* Setup for mock event stuff */ static void mock_event_free_all(void); static void mock_event_init(void); /* Mocks used by scheduler tests */ +static int circuitmux_compare_muxes_mock(circuitmux_t *cmux_1, + circuitmux_t *cmux_2); +static const circuitmux_policy_t * circuitmux_get_policy_mock( + circuitmux_t *cmux); static struct event_base * tor_libevent_get_base_mock(void); /* Scheduler test cases */ +static void test_scheduler_compare_channels(void *arg); static void test_scheduler_initfree(void *arg); +static void test_scheduler_queue_heuristic(void *arg); /* Mock event init/free */ @@ -99,6 +117,51 @@ mock_event_init(void) /* Mocks */ +static int +circuitmux_compare_muxes_mock(circuitmux_t *cmux_1, + circuitmux_t *cmux_2) +{ + int result = 0; + + test_assert(cmux_1 != NULL); + test_assert(cmux_2 != NULL); + + if (cmux_1 != cmux_2) { + if (cmux_1 == mock_ccm_tgt_1 && cmux_2 == mock_ccm_tgt_2) result = -1; + else if (cmux_1 == mock_ccm_tgt_2 && cmux_2 == mock_ccm_tgt_1) { + result = 1; + } + else { + if (cmux_1 == mock_ccm_tgt_1 || cmux_1 == mock_ccm_tgt_1) result = -1; + else if (cmux_2 == mock_ccm_tgt_1 || cmux_2 == mock_ccm_tgt_2) { + result = 1; + } else { + result = circuitmux_compare_muxes__real(cmux_1, cmux_2); + } + } + } + /* else result = 0 always */ + + done: + return result; +} + +static const circuitmux_policy_t * +circuitmux_get_policy_mock(circuitmux_t *cmux) +{ + const circuitmux_policy_t *result = NULL; + + test_assert(cmux != NULL); + if (cmux) { + if (cmux == mock_cgp_tgt_1) result = mock_cgp_val_1; + else if (cmux == mock_cgp_tgt_2) result = mock_cgp_val_2; + else result = circuitmux_get_policy__real(cmux); + } + + done: + return result; +} + static struct event_base * tor_libevent_get_base_mock(void) { @@ -108,6 +171,76 @@ tor_libevent_get_base_mock(void) /* Test cases */ static void +test_scheduler_compare_channels(void *arg) +{ + /* We don't actually need whole fake channels... */ + channel_t c1, c2; + /* ...and some dummy circuitmuxes too */ + circuitmux_t *cm1 = NULL, *cm2 = NULL; + int result; + + (void)arg; + + /* We can't actually see sizeof(circuitmux_t) from here */ + cm1 = tor_malloc_zero(sizeof(void *)); + cm2 = tor_malloc_zero(sizeof(void *)); + + c1.cmux = cm1; + c2.cmux = cm2; + + /* Configure circuitmux_get_policy() mock */ + mock_cgp_tgt_1 = cm1; + /* + * This is to test the different-policies case, which uses the policy + * cast to an intptr_t as an arbitrary but definite thing to compare. + */ + mock_cgp_val_1 = (const circuitmux_policy_t *)(1); + mock_cgp_tgt_2 = cm2; + mock_cgp_val_2 = (const circuitmux_policy_t *)(2); + + MOCK(circuitmux_get_policy, circuitmux_get_policy_mock); + + /* Now set up circuitmux_compare_muxes() mock using cm1/cm2 */ + mock_ccm_tgt_1 = cm1; + mock_ccm_tgt_2 = cm2; + MOCK(circuitmux_compare_muxes, circuitmux_compare_muxes_mock); + + /* Equal-channel case */ + result = scheduler_compare_channels(&c1, &c1); + test_eq(result, 0); + + /* Distinct channels, distinct policies */ + result = scheduler_compare_channels(&c1, &c2); + test_eq(result, -1); + result = scheduler_compare_channels(&c2, &c1); + test_eq(result, 1); + + /* Distinct channels, same policy */ + mock_cgp_val_2 = mock_cgp_val_1; + result = scheduler_compare_channels(&c1, &c2); + test_eq(result, -1); + result = scheduler_compare_channels(&c2, &c1); + test_eq(result, 1); + + done: + + UNMOCK(circuitmux_compare_muxes); + mock_ccm_tgt_1 = NULL; + mock_ccm_tgt_2 = NULL; + + UNMOCK(circuitmux_get_policy); + mock_cgp_tgt_1 = NULL; + mock_cgp_val_1 = NULL; + mock_cgp_tgt_2 = NULL; + mock_cgp_val_2 = NULL; + + tor_free(cm1); + tor_free(cm2); + + return; +} + +static void test_scheduler_initfree(void *arg) { (void)arg; @@ -170,6 +303,8 @@ test_scheduler_queue_heuristic(void *arg) } struct testcase_t scheduler_tests[] = { + { "compare_channels", test_scheduler_compare_channels, + TT_FORK, NULL, NULL }, { "initfree", test_scheduler_initfree, TT_FORK, NULL, NULL }, { "queue_heuristic", test_scheduler_queue_heuristic, TT_FORK, NULL, NULL },

1 0

[tor/master] Add changes file for global scheduler/cmux refactor
by nickm＠torproject.org 28 Nov '14

28 Nov '14

commit 52cfaa84b7b2f1098a15c431433f486a150cc854 Author: Andrea Shepard <andrea(a)torproject.org> Date: Thu Dec 12 04:36:15 2013 -0800 Add changes file for global scheduler/cmux refactor --- changes/global_scheduler | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/global_scheduler b/changes/global_scheduler new file mode 100644 index 0000000..d0b8305 --- /dev/null +++ b/changes/global_scheduler @@ -0,0 +1,4 @@ + o Major changes: + - Implement a new inter-cmux comparison API, a global high/low watermark + mechanism and a global scheduler loop for transmission prioritization + across all channels as well as among circuits on one channel.

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
96
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2014