diff options
| author | cypherpunks <cypherpunks@torproject.org> | 2015-02-21 17:18:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-23 11:19:31 -0500 |
| commit | 5246e8f99255b376ded3d90b3c7a345c4748e68c (patch) | |
| tree | 29959cb325f3f95a2fc051cf3395e82208bb8a0c /src/test/test_oom.c | |
| parent | 385558c32f666456ed10ed9dce3f4009437b015d (diff) | |
| download | tor-5246e8f99255b376ded3d90b3c7a345c4748e68c.tar.gz tor-5246e8f99255b376ded3d90b3c7a345c4748e68c.zip | |
Remove lingering mempool code
Diffstat (limited to 'src/test/test_oom.c')
| -rw-r--r-- | src/test/test_oom.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/test/test_oom.c b/src/test/test_oom.c index 28b4c0435a..41cfcdbd81 100644 --- a/src/test/test_oom.c +++ b/src/test/test_oom.c @@ -13,9 +13,6 @@ #include "compat_libevent.h" #include "connection.h" #include "config.h" -#ifdef ENABLE_MEMPOOLS -#include "mempool.h" -#endif #include "relay.h" #include "test.h" @@ -143,10 +140,6 @@ test_oom_circbuf(void *arg) MOCK(circuit_mark_for_close_, circuit_mark_for_close_dummy_); -#ifdef ENABLE_MEMPOOLS - init_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - /* Far too low for real life. */ options->MaxMemInQueues = 256*packed_cell_mem_cost(); options->CellStatistics = 0; @@ -164,13 +157,8 @@ test_oom_circbuf(void *arg) tor_gettimeofday_cache_set(&tv); c2 = dummy_or_circuit_new(20, 20); -#ifdef ENABLE_MEMPOOLS - tt_int_op(packed_cell_mem_cost(), OP_EQ, - sizeof(packed_cell_t) + MP_POOL_ITEM_OVERHEAD); -#else tt_int_op(packed_cell_mem_cost(), OP_EQ, sizeof(packed_cell_t)); -#endif /* ENABLE_MEMPOOLS */ tt_int_op(cell_queues_get_total_allocation(), OP_EQ, packed_cell_mem_cost() * 70); tt_int_op(cell_queues_check_size(), OP_EQ, 0); /* We are still not OOM */ @@ -242,10 +230,6 @@ test_oom_streambuf(void *arg) MOCK(circuit_mark_for_close_, circuit_mark_for_close_dummy_); -#ifdef ENABLE_MEMPOOLS - init_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - /* Far too low for real life. */ options->MaxMemInQueues = 81*packed_cell_mem_cost() + 4096 * 34; options->CellStatistics = 0; |