summaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-20 14:52:24 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-20 14:52:24 -0400
commit01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9 (patch)
treed20337ec9be297b82497bcbac1cd928c64ddd3ff /src/or/relay.c
parent7c61d10c6c09b32a4b8acd2553aa05c4fbc06611 (diff)
parent7f5a440421b122c2d594a89e21799078b3d7284a (diff)
downloadtor-01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9.tar.gz
tor-01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9.zip
Merge branch 'bug10116_squashed'
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index 4d71157db8..bb60469066 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2328,15 +2328,15 @@ packed_cell_free(packed_cell_t *cell)
void
dump_cell_pool_usage(int severity)
{
- circuit_t *c;
int n_circs = 0;
int n_cells = 0;
- TOR_LIST_FOREACH(c, circuit_get_global_list(), head) {
+ SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, c) {
n_cells += c->n_chan_cells.n;
if (!CIRCUIT_IS_ORIGIN(c))
n_cells += TO_OR_CIRCUIT(c)->p_chan_cells.n;
++n_circs;
}
+ SMARTLIST_FOREACH_END(c);
tor_log(severity, LD_MM,
"%d cells allocated on %d circuits. %d cells leaked.",
n_cells, n_circs, (int)total_cells_allocated - n_cells);