diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-20 07:50:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-20 07:50:46 -0400 |
| commit | 56ae6d8766583c5d9c860ee569207c0d75f17aa8 (patch) | |
| tree | 7b74882d6eb79f0433fe117675d58551821316e5 /src/or/circuitlist.c | |
| parent | a08e18545abc8c195531dff78bf9aa5a838cff39 (diff) | |
| parent | fd36bd8971db1f22546569edb537f9777415a0d6 (diff) | |
| download | tor-56ae6d8766583c5d9c860ee569207c0d75f17aa8.tar.gz tor-56ae6d8766583c5d9c860ee569207c0d75f17aa8.zip | |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 00726ca986..f362b8e97f 100644 --- 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()); { |