summaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-12-10 11:15:23 -0500
committerNick Mathewson <nickm@torproject.org>2009-12-12 19:06:38 -0500
commitc43fee131d306507937733c7ddc45a040dd2d27c (patch)
tree6ff80655b104ed568b2482652a92e5206f5f7486 /src/or/relay.c
parentd3be00e0f454998db6387c8547d218a0db93db21 (diff)
downloadtor-c43fee131d306507937733c7ddc45a040dd2d27c.tar.gz
tor-c43fee131d306507937733c7ddc45a040dd2d27c.zip
Adjust EWMA patch to conform to whitespace style.
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index 147412f596..9b7396afac 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1938,24 +1938,24 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max,
/* Update the EWMA cell counter to account for the passage of time. */
delta_t = (double)(now_hires.tv_sec -
- cell_ewma->last_cell_time.tv_sec);
+ cell_ewma->last_cell_time.tv_sec);
delta_t += ((double)(now_hires.tv_usec -
- cell_ewma->last_cell_time.tv_usec)) / 1000000.0;
+ cell_ewma->last_cell_time.tv_usec)) / 1000000.0;
if (delta_t > 0.0) {
cell_ewma->cell_count *=
- pow(cell_ewma_significance, delta_t / cell_ewma_interval);
- //printf("cc: %f ", cell_ewma->cell_count);
+ pow(cell_ewma_significance, delta_t / cell_ewma_interval);
+ //printf("cc: %f ", cell_ewma->cell_count);
}
cell_ewma->last_cell_time = now_hires;
/* Now keep track of the lowest cell count we've seen. */
if (circ_min_cell_count == NULL ||
- cell_ewma->cell_count < min_cell_count) {
- min_cell_count = cell_ewma->cell_count;
- circ_min_cell_count = circ_iter;
+ cell_ewma->cell_count < min_cell_count) {
+ min_cell_count = cell_ewma->cell_count;
+ circ_min_cell_count = circ_iter;
}
-
+
circ_iter = *next_circ_on_conn_p(circ_iter, conn);
} while (circ_iter != circ_start);
@@ -1971,7 +1971,6 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max,
cell_ewma = &(TO_OR_CIRCUIT(circ_min_cell_count)->p_cell_ewma);
}
}
-
if (circ->n_conn == conn) {
queue = &circ->n_conn_cells;