diff options
author | Mike Perry <mikeperry-git@torproject.org> | 2020-10-20 10:50:27 -0500 |
---|---|---|
committer | Mike Perry <mikeperry-git@torproject.org> | 2021-02-18 11:21:25 -0600 |
commit | 37b21591502d080b5f8ba9c1d0b37bd226b7f183 (patch) | |
tree | 83fe3ad8b408b3889a598fdbcb966642f8b9c0c3 /src/test | |
parent | 21317c92296f0c08176c8788f8f2bcf501e78032 (diff) | |
download | tor-37b21591502d080b5f8ba9c1d0b37bd226b7f183.tar.gz tor-37b21591502d080b5f8ba9c1d0b37bd226b7f183.zip |
Completely ignore abandoned circs from circ timeout calc
This prevents the timeout curve from getting spread out as much, resulting in
more accurate timeout values for quantiles from 60-80.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/test.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/test/test.c b/src/test/test.c index 58b468775c..cd21a37409 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -384,7 +384,6 @@ test_circuit_timeout(void *arg) double timeout1, timeout2; or_state_t *state=NULL; int i, runs; - double close_ms; (void)arg; initialize_periodic_events(); @@ -406,18 +405,11 @@ test_circuit_timeout(void *arg) circuit_build_times_initial_alpha(&initial, CBT_DEFAULT_QUANTILE_CUTOFF/100.0, timeout0); - close_ms = MAX(circuit_build_times_calculate_timeout(&initial, - CBT_DEFAULT_CLOSE_QUANTILE/100.0), - CBT_DEFAULT_TIMEOUT_INITIAL_VALUE); do { for (i=0; i < CBT_DEFAULT_MIN_CIRCUITS_TO_OBSERVE; i++) { build_time_t sample = circuit_build_times_generate_sample(&initial,0,1); - if (sample > close_ms) { - circuit_build_times_add_time(&estimate, CBT_BUILD_ABANDONED); - } else { - circuit_build_times_add_time(&estimate, sample); - } + circuit_build_times_add_time(&estimate, sample); } circuit_build_times_update_alpha(&estimate); timeout1 = circuit_build_times_calculate_timeout(&estimate, |