diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
| commit | a28df3fb6713043e801fb5fcf5019fc0539b5066 (patch) | |
| tree | c67fce712d60ac0ff073b0c59bb4b06e7dae04b4 /src/test/test_circuitmux.c | |
| parent | 3d2366c676233c30133928940b4bc19d8f25f193 (diff) | |
| parent | 12b6c7df4aaf3224bc5649ef69a06dccc58ae961 (diff) | |
| download | tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.tar.gz tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.zip | |
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
Conflicts:
src/or/or.h
src/test/Makefile.nmake
Diffstat (limited to 'src/test/test_circuitmux.c')
| -rw-r--r-- | src/test/test_circuitmux.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c index b8590d6d24..e88d18f061 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -8,6 +8,7 @@ #include "channel.h" #include "circuitmux.h" #include "relay.h" +#include "scheduler.h" #include "test.h" /* XXXX duplicated function from test_circuitlist.c */ @@ -36,6 +37,8 @@ test_cmux_destroy_cell_queue(void *arg) cell_queue_t *cq = NULL; packed_cell_t *pc = NULL; + scheduler_init(); + #ifdef ENABLE_MEMPOOLS init_cell_pool(); #endif /* ENABLE_MEMPOOLS */ |