commit ca1d1c382ceb0201bf8761f2b45a0e6f8e83b9be Merge: d8c0c62c7 ac9eebd63 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 10 12:46:39 2018 -0500

Merge remote-tracking branch 'ffmancera/github/bug24501'

changes/ticket24501 | 3 +++ src/or/circuitlist.c | 12 +++++++++--- src/or/relay.c | 2 +- src/or/relay.h | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-)

diff --cc src/or/circuitlist.c index f074025a3,c1b5c1a95..661438d8f --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@@ -2403,10 -2328,16 +2403,16 @@@ circuits_handle_oom(size_t current_allo size_t mem_recovered=0; int n_circuits_killed=0; int n_dirconns_killed=0; - uint32_t now_ms; + uint32_t now_ts; - log_notice(LD_GENERAL, "We're low on memory. Killing circuits with " - "over-long queues. (This behavior is controlled by " - "MaxMemInQueues.)"); + log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc: %zu," + " buffer total alloc: %zu, tor compress total alloc: %zu," + " rendezvous cache total alloc: %zu). Killing circuits with" + " over-long queues. (This behavior is controlled by" + " MaxMemInQueues.)", + cell_queues_get_total_allocation(), + buf_get_total_allocation(), + tor_compress_get_total_allocation(), + rend_cache_get_total_allocation());

{ size_t mem_target = (size_t)(get_options()->MaxMemInQueues * diff --cc src/or/relay.h index daf789c85,479ce5496..f0fa7e987 --- a/src/or/relay.h +++ b/src/or/relay.h @@@ -113,8 -103,6 +114,7 @@@ STATIC int connection_edge_process_reso const relay_header_t *rh); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); +STATIC destroy_cell_t *destroy_cell_queue_pop(destroy_cell_queue_t *queue); - STATIC size_t cell_queues_get_total_allocation(void); STATIC int cell_queues_check_size(void); #endif /* defined(RELAY_PRIVATE) */