diff options
| author | Ivan Shapovalov <intelfx100@gmail.com> | 2015-03-07 08:44:52 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-03-07 08:44:57 -0500 |
| commit | 6e392c9c45643d106673c6643ac8bf4e65da13c1 (patch) | |
| tree | 77cd87fdc7f0e104f2f48fb0ea282111dde94766 /src/core/timer.c | |
| parent | 6829cec4dce1b41c895425a120b70d0a3ed677ab (diff) | |
core: do not spawn jobs or touch other units during coldplugging
Because the order of coldplugging is not defined, we can reference a
not-yet-coldplugged unit and read its state while it has not yet been
set to a meaningful value.
This way, already active units may get started again.
We fix this by deferring such actions until all units have been at
least somehow coldplugged.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=88401
Diffstat (limited to 'src/core/timer.c')
| -rw-r--r-- | src/core/timer.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/timer.c b/src/core/timer.c index 940550194b..79a7540553 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -267,7 +267,12 @@ static void timer_set_state(Timer *t, TimerState state) { static void timer_enter_waiting(Timer *t, bool initial); -static int timer_coldplug(Unit *u) { +static int timer_enter_waiting_coldplug(Unit *u) { + timer_enter_waiting(TIMER(u), false); + return 0; +} + +static int timer_coldplug(Unit *u, Hashmap *deferred_work) { Timer *t = TIMER(u); assert(t); @@ -275,9 +280,10 @@ static int timer_coldplug(Unit *u) { if (t->deserialized_state != t->state) { - if (t->deserialized_state == TIMER_WAITING) - timer_enter_waiting(t, false); - else + if (t->deserialized_state == TIMER_WAITING) { + hashmap_put(deferred_work, u, &timer_enter_waiting_coldplug); + timer_set_state(t, TIMER_WAITING); + } else timer_set_state(t, t->deserialized_state); } |