diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-21 13:26:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-21 13:26:47 -0500 |
| commit | ab4395d08206d82f69512340cf5372d5121561ad (patch) | |
| tree | c693d3802b233ea039b584802b3aec5ffb6aa543 /src/app/main | |
| parent | 9190f43b1a9a6cb4eee02c6dc0a5fae17f9bfc59 (diff) | |
| parent | bc836d559dce5756f8ad2150d2351220ba7610f2 (diff) | |
| download | tor-ab4395d08206d82f69512340cf5372d5121561ad.tar.gz tor-ab4395d08206d82f69512340cf5372d5121561ad.zip | |
Merge branch 'ticket28847'
Diffstat (limited to 'src/app/main')
| -rw-r--r-- | src/app/main/main.c | 5 | ||||
| -rw-r--r-- | src/app/main/subsystem_list.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c index aa322046fe..d71e43ec30 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -74,7 +74,6 @@ #include "lib/net/resolve.h" #include "lib/process/waitpid.h" -#include "lib/process/process.h" #include "lib/meminfo/meminfo.h" #include "lib/osinfo/uname.h" @@ -560,9 +559,6 @@ tor_init(int argc, char *argv[]) addressmap_init(); /* Init the client dns cache. Do it always, since it's * cheap. */ - /* Initialize Process subsystem. */ - process_init(); - /* Initialize the HS subsystem. */ hs_init(); @@ -790,7 +786,6 @@ tor_free_all(int postfork) circuitmux_ewma_free_all(); accounting_free_all(); protover_summary_cache_free_all(); - process_free_all(); if (!postfork) { config_free_all(); diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index 8640329e92..122f7af215 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -18,6 +18,7 @@ #include "lib/time/time_sys.h" #include "lib/tls/tortls_sys.h" #include "lib/wallclock/wallclock_sys.h" +#include "lib/process/process_sys.h" #include <stddef.h> @@ -32,6 +33,7 @@ const subsys_fns_t *tor_subsystems[] = { &sys_logging, /* -90 */ &sys_time, /* -90 */ &sys_network, /* -90 */ + &sys_process, /* -80 */ &sys_compress, /* -70 */ &sys_crypto, /* -60 */ &sys_tortls, /* -50 */ |