]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Remove now-extraneous calls to initialize_periodic_events().
authorNick Mathewson <nickm@torproject.org>
Fri, 26 Apr 2019 16:46:14 +0000 (12:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 30 Apr 2019 15:14:59 +0000 (11:14 -0400)
This is now the responsibility of the mainloop's subsystem initializer.

src/core/mainloop/mainloop.c

index 8e61bd7e6c000e2c9a3cf107f96fd11aaf6f2bf2..0c825bb1be6578d5aa3e123305a39a09815c9feb 100644 (file)
@@ -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 };