X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimer.c;h=627a360fe6f339f5a2e413b72e1e4101742eed55;hp=e95b4d66e10e3b1262cf4da292b817ef882ee163;hb=b363ca6f206258acff8bc0a27dc72a99210011a8;hpb=871d7de47c13ee6cd78b8eefdf9128be3c740ac0 diff --git a/src/timer.c b/src/timer.c index e95b4d66e..627a360fe 100644 --- a/src/timer.c +++ b/src/timer.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -25,13 +25,15 @@ #include "unit-name.h" #include "timer.h" #include "dbus-timer.h" +#include "special.h" +#include "bus-errors.h" static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = { [TIMER_DEAD] = UNIT_INACTIVE, [TIMER_WAITING] = UNIT_ACTIVE, [TIMER_RUNNING] = UNIT_ACTIVE, [TIMER_ELAPSED] = UNIT_ACTIVE, - [TIMER_MAINTAINANCE] = UNIT_INACTIVE + [TIMER_FAILED] = UNIT_FAILED }; static void timer_init(Unit *u) { @@ -41,7 +43,6 @@ static void timer_init(Unit *u) { assert(u->meta.load_state == UNIT_STUB); t->next_elapse = (usec_t) -1; - t->timer_watch.type = WATCH_INVALID; } static void timer_done(Unit *u) { @@ -61,7 +62,7 @@ static void timer_done(Unit *u) { static int timer_verify(Timer *t) { assert(t); - if (UNIT(t)->meta.load_state != UNIT_LOADED) + if (t->meta.load_state != UNIT_LOADED) return 0; if (!t->values) { @@ -72,6 +73,18 @@ static int timer_verify(Timer *t) { return 0; } +static int timer_add_default_dependencies(Timer *t) { + int r; + + assert(t); + + if (t->meta.manager->running_as == MANAGER_SYSTEM) + if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0) + return r; + + return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); +} + static int timer_load(Unit *u) { Timer *t = TIMER(u); int r; @@ -90,6 +103,10 @@ static int timer_load(Unit *u) { if ((r = unit_add_dependency(u, UNIT_BEFORE, t->unit, true)) < 0) return r; + + if (t->meta.default_dependencies) + if ((r = timer_add_default_dependencies(t)) < 0) + return r; } return timer_verify(t); @@ -97,15 +114,10 @@ static int timer_load(Unit *u) { static void timer_dump(Unit *u, FILE *f, const char *prefix) { Timer *t = TIMER(u); - const char *prefix2; - char *p2; TimerValue *v; char timespan1[FORMAT_TIMESPAN_MAX]; - p2 = strappend(prefix, "\t"); - prefix2 = p2 ? p2 : prefix; - fprintf(f, "%sTimer State: %s\n" "%sUnit: %s\n", @@ -118,8 +130,6 @@ static void timer_dump(Unit *u, FILE *f, const char *prefix) { prefix, timer_base_to_string(v->base), strna(format_timespan(timespan1, sizeof(timespan1), v->value))); - - free(p2); } static void timer_set_state(Timer *t, TimerState state) { @@ -151,9 +161,7 @@ static int timer_coldplug(Unit *u) { if (t->deserialized_state != t->state) { - if (t->deserialized_state == TIMER_WAITING || - t->deserialized_state == TIMER_RUNNING || - t->deserialized_state == TIMER_ELAPSED) + if (t->deserialized_state == TIMER_WAITING) timer_enter_waiting(t, false); else timer_set_state(t, t->deserialized_state); @@ -168,7 +176,7 @@ static void timer_enter_dead(Timer *t, bool success) { if (!success) t->failure = true; - timer_set_state(t, t->failure ? TIMER_MAINTAINANCE : TIMER_DEAD); + timer_set_state(t, t->failure ? TIMER_FAILED : TIMER_DEAD); } static void timer_enter_waiting(Timer *t, bool initial) { @@ -187,9 +195,9 @@ static void timer_enter_waiting(Timer *t, bool initial) { switch (v->base) { case TIMER_ACTIVE: - if (state_translation_table[t->state] == UNIT_ACTIVE) { + if (state_translation_table[t->state] == UNIT_ACTIVE) base = t->meta.inactive_exit_timestamp.monotonic; - } else + else base = n; break; @@ -256,26 +264,39 @@ fail: } static void timer_enter_running(Timer *t) { + DBusError error; int r; + assert(t); + dbus_error_init(&error); + + /* Don't start job if we are supposed to go down */ + if (t->meta.job && t->meta.job->type == JOB_STOP) + return; - if ((r = manager_add_job(UNIT(t)->meta.manager, JOB_START, t->unit, JOB_REPLACE, true, NULL)) < 0) + if ((r = manager_add_job(t->meta.manager, JOB_START, t->unit, JOB_REPLACE, true, &error, NULL)) < 0) goto fail; timer_set_state(t, TIMER_RUNNING); return; fail: - log_warning("%s failed to queue unit startup job: %s", t->meta.id, strerror(-r)); + log_warning("%s failed to queue unit startup job: %s", t->meta.id, bus_error(&error, r)); timer_enter_dead(t, false); + + dbus_error_free(&error); } static int timer_start(Unit *u) { Timer *t = TIMER(u); assert(t); - assert(t->state == TIMER_DEAD); + assert(t->state == TIMER_DEAD || t->state == TIMER_FAILED); + if (t->unit->meta.load_state != UNIT_LOADED) + return -ENOENT; + + t->failure = false; timer_enter_waiting(t, true); return 0; } @@ -373,9 +394,12 @@ void timer_unit_notify(Unit *u, UnitActiveState new_state) { if (!p) continue; + if (p->meta.load_state != UNIT_LOADED) + continue; + t = TIMER(p); - if (t->meta.load_state != UNIT_LOADED) + if (t->unit != u) continue; /* Reenable all timers that depend on unit state */ @@ -395,7 +419,7 @@ void timer_unit_notify(Unit *u, UnitActiveState new_state) { case TIMER_RUNNING: - if (new_state == UNIT_INACTIVE) { + if (UNIT_IS_INACTIVE_OR_FAILED(new_state)) { log_debug("%s got notified about unit deactivation.", t->meta.id); timer_enter_waiting(t, false); } @@ -403,8 +427,8 @@ void timer_unit_notify(Unit *u, UnitActiveState new_state) { break; case TIMER_DEAD: - case TIMER_MAINTAINANCE: - ; + case TIMER_FAILED: + break; default: assert_not_reached("Unknown timer state"); @@ -417,22 +441,33 @@ fail: log_error("Failed find timer unit: %s", strerror(-r)); } +static void timer_reset_failed(Unit *u) { + Timer *t = TIMER(u); + + assert(t); + + if (t->state == TIMER_FAILED) + timer_set_state(t, TIMER_DEAD); + + t->failure = false; +} + static const char* const timer_state_table[_TIMER_STATE_MAX] = { [TIMER_DEAD] = "dead", [TIMER_WAITING] = "waiting", [TIMER_RUNNING] = "running", [TIMER_ELAPSED] = "elapsed", - [TIMER_MAINTAINANCE] = "maintainance" + [TIMER_FAILED] = "failed" }; DEFINE_STRING_TABLE_LOOKUP(timer_state, TimerState); static const char* const timer_base_table[_TIMER_BASE_MAX] = { - [TIMER_ACTIVE] = "OnActive", - [TIMER_BOOT] = "OnBoot", - [TIMER_STARTUP] = "OnStartup", - [TIMER_UNIT_ACTIVE] = "OnUnitActive", - [TIMER_UNIT_INACTIVE] = "OnUnitInactive" + [TIMER_ACTIVE] = "OnActiveSec", + [TIMER_BOOT] = "OnBootSec", + [TIMER_STARTUP] = "OnStartupSec", + [TIMER_UNIT_ACTIVE] = "OnUnitActiveSec", + [TIMER_UNIT_INACTIVE] = "OnUnitInactiveSec" }; DEFINE_STRING_TABLE_LOOKUP(timer_base, TimerBase); @@ -459,5 +494,9 @@ const UnitVTable timer_vtable = { .timer_event = timer_timer_event, - .bus_message_handler = bus_timer_message_handler + .reset_failed = timer_reset_failed, + + .bus_interface = "org.freedesktop.systemd1.Timer", + .bus_message_handler = bus_timer_message_handler, + .bus_invalidating_properties = bus_timer_invalidating_properties };