diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-26 12:46:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-30 11:14:59 -0400 |
| commit | 9a62a820fb2b0319c27d5f5131c2227a66133ee0 (patch) | |
| tree | 8b0ac550c19c548cb55d89950b6ec71d48265082 /src/core/mainloop | |
| parent | 7e03500eefacdb8a987b16d4a9b256443216a27e (diff) | |
| download | tor-9a62a820fb2b0319c27d5f5131c2227a66133ee0.tar.gz tor-9a62a820fb2b0319c27d5f5131c2227a66133ee0.zip | |
Remove now-extraneous calls to initialize_periodic_events().
This is now the responsibility of the mainloop's subsystem initializer.
Diffstat (limited to 'src/core/mainloop')
| -rw-r--r-- | src/core/mainloop/mainloop.c | 5 |
1 files 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 }; |