From 9a62a820fb2b0319c27d5f5131c2227a66133ee0 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 26 Apr 2019 12:46:14 -0400 Subject: [PATCH] Remove now-extraneous calls to initialize_periodic_events(). This is now the responsibility of the mainloop's subsystem initializer. --- src/core/mainloop/mainloop.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index 8e61bd7e6c..0c825bb1be 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -2610,8 +2610,6 @@ dns_servers_relaunch_checks(void) void initialize_mainloop_events(void) { - initialize_periodic_events(); - if (!schedule_active_linked_connections_event) { schedule_active_linked_connections_event = mainloop_event_postloop_new(schedule_active_linked_connections_cb, NULL); @@ -2629,8 +2627,9 @@ do_main_loop(void) /* initialize the periodic events first, so that code that depends on the * events being present does not assert. */ - initialize_periodic_events(); + tor_assert(periodic_events_initialized); initialize_mainloop_events(); + periodic_events_setup_all(); struct timeval one_second = { 1, 0 };