diff options
author | David Goulet <dgoulet@torproject.org> | 2017-09-14 14:22:22 -0400 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2017-09-15 11:40:59 -0400 |
commit | 14cd8bdd4ba6f4c5946ecd9877c77c9ba305bbe8 (patch) | |
tree | 1c76e5bfe124d06d7e68582b7f644ad843066c83 /src/or/scheduler_vanilla.c | |
parent | 84d18f70f3400df3e9c3b3c47288e82cd9160f6e (diff) | |
download | tor-14cd8bdd4ba6f4c5946ecd9877c77c9ba305bbe8.tar.gz tor-14cd8bdd4ba6f4c5946ecd9877c77c9ba305bbe8.zip |
sched: Don't expose the global scheduler libevent object
Instead, add wrappers to do the needed action the different scheduler needs
with the libevent object.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/scheduler_vanilla.c')
-rw-r--r-- | src/or/scheduler_vanilla.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/or/scheduler_vanilla.c b/src/or/scheduler_vanilla.c index efc0e98de2..541ee80060 100644 --- a/src/or/scheduler_vanilla.c +++ b/src/or/scheduler_vanilla.c @@ -43,15 +43,9 @@ vanilla_scheduler_schedule(void) if (!have_work()) { return; } - struct event *ev = get_run_sched_ev(); - IF_BUG_ONCE(!ev) { - log_warn(LD_SCHED, "Wow we don't have a scheduler event. That's really " - "weird! We can't really schedule a scheduling run with libevent " - "without it. So we're going to stop trying now and hope we have " - "one next time. If we never get one, we're broken."); - return; - } - event_active(ev, EV_TIMEOUT, 1); + + /* Activate our event so it can process channels. */ + scheduler_ev_active(EV_TIMEOUT); } static void |