Merge commit 'mikeperry/circuittimeout-1103'

This commit is contained in:
Nick Mathewson 2009-09-21 23:35:49 -04:00
commit 6acfa31d59

View File

@ -643,6 +643,8 @@ circuit_build_times_count_pretimeouts(circuit_build_times_t *cbt)
double timeout_quantile = 1.0- double timeout_quantile = 1.0-
((double)cbt->pre_timeouts)/ ((double)cbt->pre_timeouts)/
(cbt->pre_timeouts+cbt->total_build_times); (cbt->pre_timeouts+cbt->total_build_times);
/* Make sure it doesn't exceed the synthetic max */
timeout_quantile *= MAX_SYNTHETIC_QUANTILE;
cbt->Xm = circuit_build_times_mode(cbt); cbt->Xm = circuit_build_times_mode(cbt);
tor_assert(cbt->Xm > 0); tor_assert(cbt->Xm > 0);
/* Use current timeout to get an estimate on alpha */ /* Use current timeout to get an estimate on alpha */