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

Make a new structure for tracking subsystem status.

Browse Source 
We used to have only one boolean per subsystem, but we're about to
have a little more information.
This commit is contained in:
Nick Mathewson 2019-10-30 09:49:55 -04:00
parent 8638989308
commit a7cfddc8d1
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/main/subsysmgr.c
View File

@ -31,12 +31,22 @@
**/ **/
static bool subsystem_array_validated = false; static bool subsystem_array_validated = false;
/**
* Runtime status of a single subsystem.
**/
typedef struct subsys_status_t {
/** True if the given subsystem is initialized. */
bool initialized;
} subsys_status_t;
/** An overestimate of the number of subsystems. */
#define N_SYS_STATUS 128
/** /**
* True if a given subsystem is initialized. Expand this array if there * True if a given subsystem is initialized. Expand this array if there
* are more than this number of subsystems. (We'd rather not * are more than this number of subsystems. (We'd rather not
* dynamically allocate in this module.) * dynamically allocate in this module.)
**/ **/
static bool sys_initialized[128]; static subsys_status_t sys_status[N_SYS_STATUS];
/** /**
* Exit with a raw assertion if the subsystems list is inconsistent; * Exit with a raw assertion if the subsystems list is inconsistent;
@ -48,8 +58,8 @@ check_and_setup(void)
if (subsystem_array_validated) if (subsystem_array_validated)
return; return;
raw_assert(ARRAY_LENGTH(sys_initialized) >= n_tor_subsystems); raw_assert(ARRAY_LENGTH(sys_status) >= n_tor_subsystems);
memset(sys_initialized, 0, sizeof(sys_initialized)); memset(sys_status, 0, sizeof(sys_status));
int last_level = MIN_SUBSYS_LEVEL; int last_level = MIN_SUBSYS_LEVEL;
@ -97,7 +107,7 @@ subsystems_init_upto(int target_level)
continue; continue;
if (sys->level > target_level) if (sys->level > target_level)
break; break;
if (sys_initialized[i]) if (sys_status[i].initialized)
continue; continue;
int r = 0; int r = 0;
if (sys->initialize) { if (sys->initialize) {
@ -112,7 +122,7 @@ subsystems_init_upto(int target_level)
sys->name, i); sys->name, i);
raw_assert_unreached_msg("A subsystem couldn't be initialized."); raw_assert_unreached_msg("A subsystem couldn't be initialized.");
} }
sys_initialized[i] = true; sys_status[i].initialized = true;
} }
return 0; return 0;
@ -132,7 +142,7 @@ subsystems_add_pubsub_upto(pubsub_builder_t *builder,
continue; continue;
if (sys->level > target_level) if (sys->level > target_level)
break; break;
if (! sys_initialized[i]) if (! sys_status[i].initialized)
continue; continue;
int r = 0; int r = 0;
if (sys->add_pubsub) { if (sys->add_pubsub) {
@ -186,13 +196,13 @@ subsystems_shutdown_downto(int target_level)
continue; continue;
if (sys->level <= target_level) if (sys->level <= target_level)
break; break;
if (! sys_initialized[i]) if (! sys_status[i].initialized)
continue; continue;
if (sys->shutdown) { if (sys->shutdown) {
log_debug(LD_GENERAL, "Shutting down %s", sys->name); log_debug(LD_GENERAL, "Shutting down %s", sys->name);
sys->shutdown(); sys->shutdown();
} }
sys_initialized[i] = false; sys_status[i].initialized = false;
} }
} }
@ -208,7 +218,7 @@ subsystems_prefork(void)
const subsys_fns_t *sys = tor_subsystems[i]; const subsys_fns_t *sys = tor_subsystems[i];
if (!sys->supported) if (!sys->supported)
continue; continue;
if (! sys_initialized[i]) if (! sys_status[i].initialized)
continue; continue;
if (sys->prefork) { if (sys->prefork) {
log_debug(LD_GENERAL, "Pre-fork: %s", sys->name); log_debug(LD_GENERAL, "Pre-fork: %s", sys->name);
@ -229,7 +239,7 @@ subsystems_postfork(void)
const subsys_fns_t *sys = tor_subsystems[i]; const subsys_fns_t *sys = tor_subsystems[i];
if (!sys->supported) if (!sys->supported)
continue; continue;
if (! sys_initialized[i]) if (! sys_status[i].initialized)
continue; continue;
if (sys->postfork) { if (sys->postfork) {
log_debug(LD_GENERAL, "Post-fork: %s", sys->name); log_debug(LD_GENERAL, "Post-fork: %s", sys->name);
@ -250,7 +260,7 @@ subsystems_thread_cleanup(void)
const subsys_fns_t *sys = tor_subsystems[i]; const subsys_fns_t *sys = tor_subsystems[i];
if (!sys->supported) if (!sys->supported)
continue; continue;
if (! sys_initialized[i]) if (! sys_status[i].initialized)
continue; continue;
if (sys->thread_cleanup) { if (sys->thread_cleanup) {
log_debug(LD_GENERAL, "Thread cleanup: %s", sys->name); log_debug(LD_GENERAL, "Thread cleanup: %s", sys->name);