diff options
author | Andrea Shepard <andrea@torproject.org> | 2012-10-01 01:50:05 -0700 |
---|---|---|
committer | Andrea Shepard <andrea@torproject.org> | 2012-10-10 00:44:46 -0700 |
commit | b7d5784c542f180c0fe7dc6ba999415cdbef3abe (patch) | |
tree | 7215eacd7174c6e345c933ff4d3512d2511141a5 | |
parent | e1de2f1437ffe67ee0ae74ae6ac1d432f3981542 (diff) | |
download | tor-b7d5784c542f180c0fe7dc6ba999415cdbef3abe.tar tor-b7d5784c542f180c0fe7dc6ba999415cdbef3abe.tar.gz |
Remove ewma setup code in init_circuit_base()/or_circuit_new() of circuitlist.c; it gets allocated when the circuit is attached to a circuitmux_t with that policy now
-rw-r--r-- | src/or/circuitlist.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index bec3dc817..cfef0aa55 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -546,12 +546,6 @@ init_circuit_base(circuit_t *circ) circ->package_window = circuit_initial_package_window(); circ->deliver_window = CIRCWINDOW_START; - /* Initialize the cell_ewma_t structure */ - circ->n_cell_ewma.last_adjusted_tick = cell_ewma_get_tick(); - circ->n_cell_ewma.cell_count = 0.0; - circ->n_cell_ewma.heap_index = -1; - circ->n_cell_ewma.is_for_p_chan = 0; - circuit_add(circ); } @@ -599,16 +593,6 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan) init_circuit_base(TO_CIRCUIT(circ)); - /* Initialize the cell_ewma_t structure */ - - /* Initialize the cell counts to 0 */ - circ->p_cell_ewma.cell_count = 0.0; - circ->p_cell_ewma.last_adjusted_tick = cell_ewma_get_tick(); - circ->p_cell_ewma.is_for_p_chan = 1; - - /* It's not in any heap yet. */ - circ->p_cell_ewma.heap_index = -1; - return circ; } |