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

Log before performing a subsystem operation

Browse Source
This commit is contained in:
Nick Mathewson 2018-11-09 11:56:26 -05:00
parent ba722e4799
commit 60d1081236
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,8 @@
#include "app/main/subsysmgr.h" #include "app/main/subsysmgr.h"
#include "lib/err/torerr.h" #include "lib/err/torerr.h"
#include "lib/log/log.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -85,8 +87,13 @@ subsystems_init_upto(int target_level)
if (sys_initialized[i]) if (sys_initialized[i])
continue; continue;
int r = 0; int r = 0;
if (sys->initialize) if (sys->initialize) {
// Note that the logging subsystem is designed so that it does no harm
// to log a message in an uninitialized state. These messages will be
// discarded for now, however.
log_debug(LD_GENERAL, "Initializing %s", sys->name);
r = sys->initialize(); r = sys->initialize();
}
if (r < 0) { if (r < 0) {
fprintf(stderr, "BUG: subsystem %s (at %u) initialization failed.\n", fprintf(stderr, "BUG: subsystem %s (at %u) initialization failed.\n",
sys->name, i); sys->name, i);
@ -123,8 +130,10 @@ subsystems_shutdown_downto(int target_level)
break; break;
if (! sys_initialized[i]) if (! sys_initialized[i])
continue; continue;
if (sys->shutdown) if (sys->shutdown) {
log_debug(LD_GENERAL, "Shutting down %s", sys->name);
sys->shutdown(); sys->shutdown();
}
sys_initialized[i] = false; sys_initialized[i] = false;
} }
} }
@ -143,8 +152,10 @@ subsystems_prefork(void)
continue; continue;
if (! sys_initialized[i]) if (! sys_initialized[i])
continue; continue;
if (sys->prefork) if (sys->prefork) {
log_debug(LD_GENERAL, "Pre-fork: %s", sys->name);
sys->prefork(); sys->prefork();
}
} }
} }
@ -162,13 +173,15 @@ subsystems_postfork(void)
continue; continue;
if (! sys_initialized[i]) if (! sys_initialized[i])
continue; continue;
if (sys->postfork) if (sys->postfork) {
log_debug(LD_GENERAL, "Post-fork: %s", sys->name);
sys->postfork(); sys->postfork();
}
} }
} }
/** /**
* Run thread-clanup code on all subsystems that declare any * Run thread-cleanup code on all subsystems that declare any
**/ **/
void void
subsystems_thread_cleanup(void) subsystems_thread_cleanup(void)
@ -181,7 +194,9 @@ subsystems_thread_cleanup(void)
continue; continue;
if (! sys_initialized[i]) if (! sys_initialized[i])
continue; continue;
if (sys->thread_cleanup) if (sys->thread_cleanup) {
log_debug(LD_GENERAL, "Thread cleanup: %s", sys->name);
sys->thread_cleanup(); sys->thread_cleanup();
}
} }
} }