summaryrefslogtreecommitdiff
path: root/src/or/circuitlist.c
diff options
context:
space:
mode:
authorFernando Fernandez Mancera <ffernandezmancera@gmail.com>2017-12-20 18:31:30 +0100
committerFernando Fernandez Mancera <ffernandezmancera@gmail.com>2017-12-20 18:31:30 +0100
commitac9eebd63637d39b2a55d9a40c748a197fd47f93 (patch)
tree3434ea6e2dd7bcbb0efa4a59b3385b5619e715dd /src/or/circuitlist.c
parent5c4da2cacd308e63293a67a4e595044d24dd56a6 (diff)
downloadtor-ac9eebd63637d39b2a55d9a40c748a197fd47f93.tar.gz
tor-ac9eebd63637d39b2a55d9a40c748a197fd47f93.zip
Add some values to OOM log msg #24501
Exposing cell_queues_get_total_allocation(), buf_get_total_allocation(), tor_compress_get_total_allocation(), tor_compress_get_total_allocation() when hit MaxMemInQueues threshold. Fixes #24501 Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r--src/or/circuitlist.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index d442887c9e..c1b5c1a951 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -2329,9 +2329,15 @@ circuits_handle_oom(size_t current_allocation)
int n_circuits_killed=0;
int n_dirconns_killed=0;
uint32_t now_ms;
- 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 *