diff options
author | David Goulet <dgoulet@torproject.org> | 2018-02-15 14:23:36 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2018-02-15 14:36:39 -0500 |
commit | c235c32bbcd33351d0d720fe2fb3dbac6369d12c (patch) | |
tree | 86838b32fa603d2131d1b615e7537c9c19eeafd2 /src/or/circuitlist.c | |
parent | 9d68647ba3fc0774653be7ac994f8a6307b146f9 (diff) | |
download | tor-c235c32bbcd33351d0d720fe2fb3dbac6369d12c.tar.gz tor-c235c32bbcd33351d0d720fe2fb3dbac6369d12c.zip |
cmux: Remove round-robin circuit policy
Since 0.2.4, tor uses EWMA circuit policy to prioritize. The previous
algorithm, round-robin, hasn't been used since then but was still used as a
fallback.
Now that EWMA is mandatory, remove that code entirely and enforce a cmux
policy to be set.
This is part of a circuitmux cleanup to improve performance and reduce
complexity in the code. We'll be able to address future optimization with this
work.
Closes #25268
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r-- | src/or/circuitlist.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 29ad9a8ee5..00726ca986 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -403,9 +403,6 @@ circuit_set_p_circid_chan(or_circuit_t *or_circ, circid_t id, circuit_set_circid_chan_helper(circ, CELL_DIRECTION_IN, id, chan); if (chan) { - tor_assert(bool_eq(or_circ->p_chan_cells.n, - or_circ->next_active_on_p_chan)); - chan->timestamp_last_had_circuits = approx_time(); } @@ -428,8 +425,6 @@ circuit_set_n_circid_chan(circuit_t *circ, circid_t id, circuit_set_circid_chan_helper(circ, CELL_DIRECTION_OUT, id, chan); if (chan) { - tor_assert(bool_eq(circ->n_chan_cells.n, circ->next_active_on_n_chan)); - chan->timestamp_last_had_circuits = approx_time(); } |