mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-14 07:03:44 +01:00
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
This commit is contained in:
parent
e1de2f1437
commit
b7d5784c54
@ -546,12 +546,6 @@ init_circuit_base(circuit_t *circ)
|
|||||||
circ->package_window = circuit_initial_package_window();
|
circ->package_window = circuit_initial_package_window();
|
||||||
circ->deliver_window = CIRCWINDOW_START;
|
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);
|
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));
|
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;
|
return circ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user