tor

commit 56ae6d8766583c5d9c860ee569207c0d75f17aa8
parent a08e18545abc8c195531dff78bf9aa5a838cff39
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 20 Mar 2018 07:50:46 -0400

Merge branch 'maint-0.3.3'

Diffstat:
A
changes/bug25372
 | 
3
+++
M
src/or/circuitlist.c
 | 
8
++++++++

2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/changes/bug25372 b/changes/bug25372
@@ -0,0 +1,3 @@
+  o Minor features (log messages):
+    - Improve log message in the out of memory handler to include information
+      about memory usage from the different compression backends. Closes ticket 25372.
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
@@ -82,6 +82,9 @@
 #include "routerlist.h"
 #include "routerset.h"
 #include "channelpadding.h"
+#include "compress_lzma.h"
+#include "compress_zlib.h"
+#include "compress_zstd.h"
 
 #include "ht.h"
 
@@ -2471,12 +2474,17 @@ circuits_handle_oom(size_t current_allocation)
   log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc:"
              " %"TOR_PRIuSZ" buffer total alloc: %" TOR_PRIuSZ ","
              " tor compress total alloc: %" TOR_PRIuSZ
+             " (zlib: %" TOR_PRIuSZ ", zstd: %" TOR_PRIuSZ ","
+             " lzma: %" TOR_PRIuSZ "),"
              " rendezvous cache total alloc: %" TOR_PRIuSZ "). Killing"
              " circuits withover-long queues. (This behavior is controlled by"
              " MaxMemInQueues.)",
              cell_queues_get_total_allocation(),
              buf_get_total_allocation(),
              tor_compress_get_total_allocation(),
+             tor_zlib_get_total_allocation(),
+             tor_zstd_get_total_allocation(),
+             tor_lzma_get_total_allocation(),
              rend_cache_get_total_allocation());
 
   {