nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove run_scheduled_events() as a separate function.

Browse Source 
(There was nothing else in second_elapsed_callbck() that couldn't go
here.)
This commit is contained in:
Nick Mathewson 2018-11-13 08:36:38 -05:00
parent a0380b705d
commit e535ec8542
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/core/mainloop/mainloop.c
View File

@ -1727,13 +1727,22 @@ safe_timer_diff(time_t now, time_t next)
} }
/** Perform regular maintenance tasks. This function gets run once per /** Perform regular maintenance tasks. This function gets run once per
* second by second_elapsed_callback(). * second.
*/ */
static void static void
run_scheduled_events(time_t now) second_elapsed_callback(periodic_timer_t *timer, void *arg)
{ {
(void) timer;
(void) arg;
const time_t now = time(NULL);
const or_options_t *options = get_options(); const or_options_t *options = get_options();
/* We don't need to do this once-per-second any more: time-updating is
* only in this callback _because it is a callback_. It should be fine
* to disable this callback, and the time will still get updated.
*/
update_current_time(now);
/* 0. See if we've been asked to shut down and our timeout has /* 0. See if we've been asked to shut down and our timeout has
* expired; or if our bandwidth limits are exhausted and we * expired; or if our bandwidth limits are exhausted and we
* should hibernate; or if it's time to wake up from hibernation. * should hibernate; or if it's time to wake up from hibernation.
@ -2642,28 +2651,6 @@ update_current_time(time_t now)
current_second = now; current_second = now;
} }
/** Libevent callback: invoked once every second. */
static void
second_elapsed_callback(periodic_timer_t *timer, void *arg)
{
/* XXXX This could be sensibly refactored into multiple callbacks, and we
* could use Libevent's timers for this rather than checking the current
* time against a bunch of timeouts every second. */
time_t now;
(void)timer;
(void)arg;
now = time(NULL);
/* We don't need to do this once-per-second any more: time-updating is
* only in this callback _because it is a callback_. It should be fine
* to disable this callback, and the time will still get updated.
*/
update_current_time(now);
run_scheduled_events(now);
}
#ifdef HAVE_SYSTEMD_209 #ifdef HAVE_SYSTEMD_209
static periodic_timer_t *systemd_watchdog_timer = NULL; static periodic_timer_t *systemd_watchdog_timer = NULL;