nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

squash! Remove a source of error during path bias scaling

Browse Source 
Improve debug logs and fix a state fencepost error.
This commit is contained in:
Mike Perry 2013-01-20 14:30:02 -08:00
parent 06a1d0b044
commit b810d322bf
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/circuitbuild.c
View File

@ -2105,6 +2105,9 @@ pathbias_count_circs_in_states(entry_guard_t *guard,
fast_memeq(guard->identity, fast_memeq(guard->identity,
ocirc->cpath->extend_info->identity_digest, ocirc->cpath->extend_info->identity_digest,
DIGEST_LEN)) { DIGEST_LEN)) {
log_debug(LD_CIRC, "Found opened circuit %d in path_state %s",
ocirc->global_identifier,
pathbias_state_to_string(ocirc->path_state));
open_circuits++; open_circuits++;
} }
} }
@ -2245,7 +2248,7 @@ pathbias_check_use_rate(entry_guard_t *guard)
const int scale_factor = pathbias_get_scale_factor(options); const int scale_factor = pathbias_get_scale_factor(options);
const int mult_factor = pathbias_get_mult_factor(options); const int mult_factor = pathbias_get_mult_factor(options);
int opened_attempts = pathbias_count_circs_in_states(guard, int opened_attempts = pathbias_count_circs_in_states(guard,
PATH_STATE_USE_ATTEMPTED, PATH_STATE_USE_ATTEMPTED); PATH_STATE_USE_ATTEMPTED, PATH_STATE_USE_SUCCEEDED);
guard->use_attempts -= opened_attempts; guard->use_attempts -= opened_attempts;
guard->use_attempts *= mult_factor; guard->use_attempts *= mult_factor;
@ -2257,8 +2260,8 @@ pathbias_check_use_rate(entry_guard_t *guard)
guard->use_attempts += opened_attempts; guard->use_attempts += opened_attempts;
log_info(LD_CIRC, log_info(LD_CIRC,
"Scaled pathbias use counts to %f/%f for guard %s=%s", "Scaled pathbias use counts to %f/%f (%d open) for guard %s=%s",
guard->use_successes, guard->use_attempts, guard->use_successes, guard->use_attempts, opened_attempts,
guard->nickname, hex_str(guard->identity, DIGEST_LEN)); guard->nickname, hex_str(guard->identity, DIGEST_LEN));
} }
@ -2416,10 +2419,11 @@ pathbias_check_close_rate(entry_guard_t *guard)
guard->circ_successes += opened_built; guard->circ_successes += opened_built;
log_info(LD_CIRC, log_info(LD_CIRC,
"Scaled pathbias counts to (%f,%f)/%f for guard %s=%s", "Scaled pathbias counts to (%f,%f)/%f (%d/%d open) for guard "
"%s=%s",
guard->circ_successes, guard->successful_circuits_closed, guard->circ_successes, guard->successful_circuits_closed,
guard->circ_attempts, guard->nickname, guard->circ_attempts, opened_built, opened_attempts,
hex_str(guard->identity, DIGEST_LEN)); guard->nickname, hex_str(guard->identity, DIGEST_LEN));
} }
return 0; return 0;