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

Track bootstrap phase independently of progress

Browse Source 
Track bootstrap phase (enumerated by bootstrap_status_t) independently
from the bootstrap progress (which can represent intermediate
progress).  This allows control_event_bootstrap_problem() to avoid
doing a linear search through the bootstrap progress space to find the
current bootstrap phase.
This commit is contained in:
Taylor Yu 2018-08-31 17:54:09 -05:00
parent 5733d3f71f
commit 687bf3ea64
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/feature/control/control.c
View File

@ -7073,6 +7073,11 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag,
* Tor initializes. */
static int bootstrap_percent = BOOTSTRAP_STATUS_UNDEF;
/** Like bootstrap_percent, but only takes on the enumerated values in
* bootstrap_status_t.
*/
static int bootstrap_phase = BOOTSTRAP_STATUS_UNDEF;
/** As bootstrap_percent, but holds the bootstrapping level at which we last
* logged a NOTICE-level message. We use this, plus BOOTSTRAP_PCT_INCREMENT,
* to avoid flooding the log with a new message every time we get a few more
@ -7158,7 +7163,8 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
control_event_bootstrap_core(loglevel, status, progress);
if (status > bootstrap_percent) {
bootstrap_percent = status; /* new milestone reached */
bootstrap_phase = status; /* new milestone reached */
bootstrap_percent = status;
}
if (progress > bootstrap_percent) {
/* incremental progress within a milestone */
@ -7206,9 +7212,7 @@ control_event_bootstrap_problem(const char *warn, const char *reason,
if (we_are_hibernating())
dowarn = 0;
while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0)
status--; /* find a recognized status string based on current progress */
status = bootstrap_percent; /* set status back to the actual number */
tor_assert(bootstrap_status_to_string(bootstrap_phase, &tag, &summary) == 0);
severity = dowarn ? LOG_WARN : LOG_INFO;