diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-21 11:59:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-22 10:15:56 -0400 |
| commit | e1c9b43b8efbc76ab3a6decf47d6d1ef1967ef77 (patch) | |
| tree | 4f24c027cda3bd8f58337bf1b312c170525333ff /src/or/circuitbuild.c | |
| parent | 4834641dce809fbb6fd4a586a823446970d19c1d (diff) | |
| download | tor-e1c9b43b8efbc76ab3a6decf47d6d1ef1967ef77.tar tor-e1c9b43b8efbc76ab3a6decf47d6d1ef1967ef77.tar.gz | |
Rename get_circuit_nbuild_* to end with _ms
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c144f274a..cb2f423ee 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -772,7 +772,8 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) * it off at, we probably had a suspend event along this codepath, * and we should discard the value. */ - if (timediff < 0 || timediff > 2*get_circuit_build_close_time()+1000) { + if (timediff < 0 || + timediff > 2*get_circuit_build_close_time_ms()+1000) { log_notice(LD_CIRC, "Strange value for circuit build time: %ldmsec. " "Assuming clock jump. Purpose %d (%s)", timediff, circ->base_.purpose, @@ -2276,7 +2277,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); guard->path_bias_disabled = 1; guard->bad_since = approx_time(); entry_guards_changed(); @@ -2302,7 +2303,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } else if (pathbias_get_use_success_count(guard)/guard->use_attempts < pathbias_get_notice_use_rate(options)) { @@ -2326,7 +2327,7 @@ pathbias_measure_use_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } } @@ -2382,7 +2383,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); guard->path_bias_disabled = 1; guard->bad_since = approx_time(); entry_guards_changed(); @@ -2408,7 +2409,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } else if (pathbias_get_close_success_count(guard)/guard->circ_attempts < pathbias_get_warn_rate(options)) { @@ -2433,7 +2434,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } else if (pathbias_get_close_success_count(guard)/guard->circ_attempts < pathbias_get_notice_rate(options)) { @@ -2456,7 +2457,7 @@ pathbias_measure_close_rate(entry_guard_t *guard) tor_lround(guard->unusable_circuits), tor_lround(guard->collapsed_circuits), tor_lround(guard->timeouts), - tor_lround(get_circuit_build_close_time()/1000)); + tor_lround(get_circuit_build_close_time_ms()/1000)); } } } |