[tor-commits] [tor/master] Remove now-extraneous calls to initialize_periodic_events().

[asn@xxxxxxxxxxxxxx]

commit 9a62a820fb2b0319c27d5f5131c2227a66133ee0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Apr 26 12:46:14 2019 -0400

    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 8e61bd7e6..0c825bb1b 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 };



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits