From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Feb 2014 18:09:02 +0000 (-0500)
Subject: On OOM, also log N circuits remaining
X-Git-Tag: tor-0.2.5.3-alpha~38^2^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79c234e0e3fa22d76029bd3b5e2c52072709cff3;p=thirdparty%2Ftor.git

On OOM, also log N circuits remaining
---

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index ffb5e0cd0e..45fc95b561 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1589,9 +1589,11 @@ circuits_handle_oom(size_t current_allocation)
   buf_shrink_freelists(1); /* This is necessary to actually release buffer
                               chunks. */
 
-  log_notice(LD_GENERAL, "Removed "U64_FORMAT" bytes by killing %d circuits.",
+  log_notice(LD_GENERAL, "Removed "U64_FORMAT" bytes by killing %d circuits; "
+             "%d circuits remain alive.",
              U64_PRINTF_ARG(mem_recovered),
-             n_circuits_killed);
+             n_circuits_killed,
+             smartlist_len(circlist) - n_circuits_killed);
 
   smartlist_free(circlist);
 }