aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-11-02 18:09:44 -0400
committerNick Mathewson <nickm@torproject.org>2018-11-05 09:22:02 -0500
commit207253df8d7c040840c7f4305534e6979bfc7bf7 (patch)
tree07e10f59d86a2ec72cd0b475ecf5e501a77ba997 /src/app
parentcad61f0f6de48c6eab6e811a081f154b03de57b8 (diff)
downloadtor-207253df8d7c040840c7f4305534e6979bfc7bf7.tar.gz
tor-207253df8d7c040840c7f4305534e6979bfc7bf7.zip
Move monotonic time setup into a subsystem
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main/main.c2
-rw-r--r--src/app/main/subsystem_list.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 74c3c41e5b..bb2e9f5cdb 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1248,7 +1248,6 @@ static int
run_tor_main_loop(void)
{
handle_signals();
- monotime_init();
timers_initialize();
initialize_mainloop_events();
@@ -1369,7 +1368,6 @@ tor_run_main(const tor_main_configuration_t *tor_cfg)
init_protocol_warning_severity_level();
tor_compress_init();
- monotime_init();
int argc = tor_cfg->argc + tor_cfg->argc_owned;
char **argv = tor_calloc(argc, sizeof(char*));
diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c
index dd64568226..a9189b9941 100644
--- a/src/app/main/subsystem_list.c
+++ b/src/app/main/subsystem_list.c
@@ -14,6 +14,7 @@
#include "lib/net/network_sys.h"
#include "lib/process/winprocess_sys.h"
#include "lib/thread/thread_sys.h"
+#include "lib/time/time_sys.h"
#include "lib/wallclock/wallclock_sys.h"
#include <stddef.h>
@@ -27,6 +28,7 @@ const subsys_fns_t *tor_subsystems[] = {
&sys_wallclock,
&sys_threads,
&sys_logging,
+ &sys_time,
&sys_network,
&sys_crypto,
};