aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-15 16:23:22 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-15 16:23:22 -0400
commit6969bd9a02895ae7dc80264fb59adba4a44f79a1 (patch)
tree3d552065414cc5ffe8cb0839c5cdd84325cb9d0f /src/or/relay.c
parentdb2af2abb03a82e7c71581efa04a45869feba38a (diff)
downloadtor-6969bd9a02895ae7dc80264fb59adba4a44f79a1.tar.gz
tor-6969bd9a02895ae7dc80264fb59adba4a44f79a1.zip
Autoconvert most circuit-list iterations to smartlist iterations
Breaks compilation. Used this coccinelle script: @@ identifier c; typedef circuit_t; iterator name TOR_LIST_FOREACH; iterator name SMARTLIST_FOREACH_BEGIN; statement S; @@ - circuit_t *c; ... - TOR_LIST_FOREACH(c, \(&global_circuitlist\|circuit_get_global_list()\), head) + SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, c) S + SMARTLIST_FOREACH_END(c);
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 f42602d412..e013925746 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2322,15 +2322,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);