diff options
| author | Andrea Shepard <andrea@torproject.org> | 2014-05-12 18:23:34 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2014-05-12 18:23:34 -0700 |
| commit | 39d4e67be8283b2a7141a7aa8342d30e27f47e6f (patch) | |
| tree | dbc602ce1470c3e8c7b2d13ec89336464b563956 /src/or/main.c | |
| parent | 17435384c050b29cd3c70819ac7176c407f4d1bb (diff) | |
| download | tor-39d4e67be8283b2a7141a7aa8342d30e27f47e6f.tar.gz tor-39d4e67be8283b2a7141a7aa8342d30e27f47e6f.zip | |
Add --disable-mempools configure option
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 6713d80368..e5a48cf98b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1522,7 +1522,9 @@ run_scheduled_events(time_t now) if (conn->inbuf) buf_shrink(conn->inbuf); }); +#ifdef ENABLE_MEMPOOL clean_cell_pool(); +#endif /* ENABLE_MEMPOOL */ buf_shrink_freelists(0); /** How often do we check buffers and pools for empty space that can be * deallocated? */ @@ -1927,8 +1929,10 @@ do_main_loop(void) } } +#ifdef ENABLE_MEMPOOLS /* Set up the packed_cell_t memory pool. */ init_cell_pool(); +#endif /* ENABLE_MEMPOOLS */ /* Set up our buckets */ connection_bucket_init(); @@ -2545,7 +2549,9 @@ tor_free_all(int postfork) router_free_all(); policies_free_all(); } +#ifdef ENABLE_MEMPOOLS free_cell_pool(); +#endif /* ENABLE_MEMPOOLS */ if (!postfork) { tor_tls_free_all(); } |