From 290837072b136624f1f3d941c7274e4b1b275021 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 25 Nov 2013 15:35:10 +0100 Subject: core: set some event source priorities to enforce dispatching order --- src/core/swap.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/core/swap.c') diff --git a/src/core/swap.c b/src/core/swap.c index fff613934a..adcf78b717 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -1238,6 +1238,13 @@ static int swap_enumerate(Manager *m) { r = sd_event_add_io(m->event, fileno(m->proc_swaps), EPOLLPRI, swap_dispatch_io, m, &m->swap_event_source); if (r < 0) goto fail; + + /* Dispatch this before we dispatch SIGCHLD, so that + * we always get the events from /proc/swaps before + * the SIGCHLD of /sbin/swapon. */ + r = sd_event_source_set_priority(m->swap_event_source, -10); + if (r < 0) + goto fail; } r = swap_load_proc_swaps(m, false); -- cgit v1.2.3-54-g00ecf