chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: show unit file preset state in "systemctl status" output"
[elogind.git]
/
src
/
core
/
timer.c
diff --git
a/src/core/timer.c
b/src/core/timer.c
index 6f2deda21f60f97fd3ddf9c7e00ffb1d9153ac71..9155dfc81fccedad8cef9638513d60a034da4407 100644
(file)
--- a/
src/core/timer.c
+++ b/
src/core/timer.c
@@
-46,8
+46,8
@@
static void timer_init(Unit *u) {
assert(u);
assert(u->load_state == UNIT_STUB);
assert(u);
assert(u->load_state == UNIT_STUB);
- t->next_elapse_monotonic_or_boottime =
(usec_t) -1
;
- t->next_elapse_realtime =
(usec_t) -1
;
+ t->next_elapse_monotonic_or_boottime =
USEC_INFINITY
;
+ t->next_elapse_realtime =
USEC_INFINITY
;
t->accuracy_usec = u->manager->default_timer_accuracy_usec;
}
t->accuracy_usec = u->manager->default_timer_accuracy_usec;
}
@@
-86,7
+86,7
@@
static int timer_verify(Timer *t) {
return 0;
if (!t->values) {
return 0;
if (!t->values) {
- log_
error_unit
(UNIT(t)->id, "%s lacks value setting. Refusing.", UNIT(t)->id);
+ log_
unit_error
(UNIT(t)->id, "%s lacks value setting. Refusing.", UNIT(t)->id);
return -EINVAL;
}
return -EINVAL;
}
@@
-95,6
+95,7
@@
static int timer_verify(Timer *t) {
static int timer_add_default_dependencies(Timer *t) {
int r;
static int timer_add_default_dependencies(Timer *t) {
int r;
+ TimerValue *v;
assert(t);
assert(t);
@@
-106,6
+107,15
@@
static int timer_add_default_dependencies(Timer *t) {
r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true);
if (r < 0)
return r;
r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true);
if (r < 0)
return r;
+
+ LIST_FOREACH(value, v, t->values) {
+ if (v->base == TIMER_CALENDAR) {
+ r = unit_add_dependency_by_name(UNIT(t), UNIT_AFTER, SPECIAL_TIME_SYNC_TARGET, NULL, true);
+ if (r < 0)
+ return r;
+ break;
+ }
+ }
}
return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
@@
-131,16
+141,14
@@
static int timer_setup_persistent(Timer *t) {
e = getenv("XDG_DATA_HOME");
if (e)
e = getenv("XDG_DATA_HOME");
if (e)
- t->stamp_path = strjoin(e, "/systemd/timers/", UNIT(t)->id, NULL);
+ t->stamp_path = strjoin(e, "/systemd/timers/
stamp-
", UNIT(t)->id, NULL);
else {
_cleanup_free_ char *h = NULL;
r = get_home_dir(&h);
else {
_cleanup_free_ char *h = NULL;
r = get_home_dir(&h);
- if (r < 0) {
- log_error("Failed to determine home directory: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to determine home directory: %m");
t->stamp_path = strjoin(h, "/.local/share/systemd/timers/stamp-", UNIT(t)->id, NULL);
}
t->stamp_path = strjoin(h, "/.local/share/systemd/timers/stamp-", UNIT(t)->id, NULL);
}
@@
-232,7
+240,7
@@
static void timer_dump(Unit *u, FILE *f, const char *prefix) {
"%s%s: %s\n",
prefix,
timer_base_to_string(v->base),
"%s%s: %s\n",
prefix,
timer_base_to_string(v->base),
-
strna(format_timespan(timespan1, sizeof(timespan1), v->value, 0)
));
+
format_timespan(timespan1, sizeof(timespan1), v->value, 0
));
}
}
}
}
}
}
@@
-250,7
+258,7
@@
static void timer_set_state(Timer *t, TimerState state) {
}
if (state != old_state)
}
if (state != old_state)
- log_
debug_unit
(UNIT(t)->id,
+ log_
unit_debug
(UNIT(t)->id,
"%s changed %s -> %s", UNIT(t)->id,
timer_state_to_string(old_state),
timer_state_to_string(state));
"%s changed %s -> %s", UNIT(t)->id,
timer_state_to_string(old_state),
timer_state_to_string(state));
@@
-409,7
+417,7
@@
static void timer_enter_waiting(Timer *t, bool initial) {
}
if (!found_monotonic && !found_realtime) {
}
if (!found_monotonic && !found_realtime) {
- log_
debug_unit
(UNIT(t)->id, "%s: Timer is elapsed.", UNIT(t)->id);
+ log_
unit_debug
(UNIT(t)->id, "%s: Timer is elapsed.", UNIT(t)->id);
timer_set_state(t, TIMER_ELAPSED);
return;
}
timer_set_state(t, TIMER_ELAPSED);
return;
}
@@
-417,7
+425,7
@@
static void timer_enter_waiting(Timer *t, bool initial) {
if (found_monotonic) {
char buf[FORMAT_TIMESPAN_MAX];
if (found_monotonic) {
char buf[FORMAT_TIMESPAN_MAX];
- log_
debug_unit
(UNIT(t)->id, "%s: Monotonic timer elapses in %s.",
+ log_
unit_debug
(UNIT(t)->id, "%s: Monotonic timer elapses in %s.",
UNIT(t)->id,
format_timespan(buf, sizeof(buf), t->next_elapse_monotonic_or_boottime > ts_monotonic ? t->next_elapse_monotonic_or_boottime - ts_monotonic : 0, 0));
UNIT(t)->id,
format_timespan(buf, sizeof(buf), t->next_elapse_monotonic_or_boottime > ts_monotonic ? t->next_elapse_monotonic_or_boottime - ts_monotonic : 0, 0));
@@
-446,7
+454,7
@@
static void timer_enter_waiting(Timer *t, bool initial) {
if (found_realtime) {
char buf[FORMAT_TIMESTAMP_MAX];
if (found_realtime) {
char buf[FORMAT_TIMESTAMP_MAX];
- log_
debug_unit
(UNIT(t)->id, "%s: Realtime timer elapses at %s.", UNIT(t)->id, format_timestamp(buf, sizeof(buf), t->next_elapse_realtime));
+ log_
unit_debug
(UNIT(t)->id, "%s: Realtime timer elapses at %s.", UNIT(t)->id, format_timestamp(buf, sizeof(buf), t->next_elapse_realtime));
if (t->realtime_event_source) {
r = sd_event_source_set_time(t->realtime_event_source, t->next_elapse_realtime);
if (t->realtime_event_source) {
r = sd_event_source_set_time(t->realtime_event_source, t->next_elapse_realtime);
@@
-475,7
+483,7
@@
static void timer_enter_waiting(Timer *t, bool initial) {
return;
fail:
return;
fail:
- log_
warning_unit(UNIT(t)->id, "%s failed to enter waiting state: %s", UNIT(t)->id, strerror(-r)
);
+ log_
unit_warning_errno(UNIT(t)->id, r, "%s failed to enter waiting state: %m", UNIT(t)->id
);
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
}
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
}
@@
-497,13
+505,13
@@
static void timer_enter_running(Timer *t) {
dual_timestamp_get(&t->last_trigger);
if (t->stamp_path)
dual_timestamp_get(&t->last_trigger);
if (t->stamp_path)
- touch_file(t->stamp_path, true, t->last_trigger.realtime,
(uid_t) -1, (gid_t) -1
, 0);
+ touch_file(t->stamp_path, true, t->last_trigger.realtime,
UID_INVALID, GID_INVALID
, 0);
timer_set_state(t, TIMER_RUNNING);
return;
fail:
timer_set_state(t, TIMER_RUNNING);
return;
fail:
- log_
warning_unit
(UNIT(t)->id,
+ log_
unit_warning
(UNIT(t)->id,
"%s failed to queue unit startup job: %s",
UNIT(t)->id, bus_error_message(&error, r));
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
"%s failed to queue unit startup job: %s",
UNIT(t)->id, bus_error_message(&error, r));
timer_enter_dead(t, TIMER_FAILURE_RESOURCES);
@@
-511,6
+519,7
@@
fail:
static int timer_start(Unit *u) {
Timer *t = TIMER(u);
static int timer_start(Unit *u) {
Timer *t = TIMER(u);
+ TimerValue *v;
assert(t);
assert(t->state == TIMER_DEAD || t->state == TIMER_FAILED);
assert(t);
assert(t->state == TIMER_DEAD || t->state == TIMER_FAILED);
@@
-520,6
+529,11
@@
static int timer_start(Unit *u) {
t->last_trigger = DUAL_TIMESTAMP_NULL;
t->last_trigger = DUAL_TIMESTAMP_NULL;
+ /* Reenable all timers that depend on unit activation time */
+ LIST_FOREACH(value, v, t->values)
+ if (v->base == TIMER_ACTIVE)
+ v->disabled = false;
+
if (t->stamp_path) {
struct stat st;
if (t->stamp_path) {
struct stat st;
@@
-529,7
+543,7
@@
static int timer_start(Unit *u) {
/* The timer has never run before,
* make sure a stamp file exists.
*/
/* The timer has never run before,
* make sure a stamp file exists.
*/
- touch_file(t->stamp_path, true,
(usec_t) -1, (uid_t) -1, (gid_t) -1
, 0);
+ touch_file(t->stamp_path, true,
USEC_INFINITY, UID_INVALID, GID_INVALID
, 0);
}
t->result = TIMER_SUCCESS;
}
t->result = TIMER_SUCCESS;
@@
-580,7
+594,7
@@
static int timer_deserialize_item(Unit *u, const char *key, const char *value, F
state = timer_state_from_string(value);
if (state < 0)
state = timer_state_from_string(value);
if (state < 0)
- log_
debug_unit
(u->id, "Failed to parse state value %s", value);
+ log_
unit_debug
(u->id, "Failed to parse state value %s", value);
else
t->deserialized_state = state;
} else if (streq(key, "result")) {
else
t->deserialized_state = state;
} else if (streq(key, "result")) {
@@
-588,23
+602,23
@@
static int timer_deserialize_item(Unit *u, const char *key, const char *value, F
f = timer_result_from_string(value);
if (f < 0)
f = timer_result_from_string(value);
if (f < 0)
- log_
debug_unit
(u->id, "Failed to parse result value %s", value);
+ log_
unit_debug
(u->id, "Failed to parse result value %s", value);
else if (f != TIMER_SUCCESS)
t->result = f;
} else if (streq(key, "last-trigger-realtime")) {
r = safe_atou64(value, &t->last_trigger.realtime);
if (r < 0)
else if (f != TIMER_SUCCESS)
t->result = f;
} else if (streq(key, "last-trigger-realtime")) {
r = safe_atou64(value, &t->last_trigger.realtime);
if (r < 0)
- log_
debug_unit
(u->id, "Failed to parse last-trigger-realtime value %s", value);
+ log_
unit_debug
(u->id, "Failed to parse last-trigger-realtime value %s", value);
} else if (streq(key, "last-trigger-monotonic")) {
r = safe_atou64(value, &t->last_trigger.monotonic);
if (r < 0)
} else if (streq(key, "last-trigger-monotonic")) {
r = safe_atou64(value, &t->last_trigger.monotonic);
if (r < 0)
- log_
debug_unit
(u->id, "Failed to parse last-trigger-monotonic value %s", value);
+ log_
unit_debug
(u->id, "Failed to parse last-trigger-monotonic value %s", value);
} else
} else
- log_
debug_unit
(u->id, "Unknown serialization key '%s'", key);
+ log_
unit_debug
(u->id, "Unknown serialization key '%s'", key);
return 0;
}
return 0;
}
@@
-629,7
+643,7
@@
static int timer_dispatch(sd_event_source *s, uint64_t usec, void *userdata) {
if (t->state != TIMER_WAITING)
return 0;
if (t->state != TIMER_WAITING)
return 0;
- log_
debug_unit
(UNIT(t)->id, "Timer elapsed on %s", UNIT(t)->id);
+ log_
unit_debug
(UNIT(t)->id, "Timer elapsed on %s", UNIT(t)->id);
timer_enter_running(t);
return 0;
}
timer_enter_running(t);
return 0;
}
@@
-662,7
+676,7
@@
static void timer_trigger_notify(Unit *u, Unit *other) {
case TIMER_RUNNING:
if (UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
case TIMER_RUNNING:
if (UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other))) {
- log_
debug_unit
(UNIT(t)->id, "%s got notified about unit deactivation.", UNIT(t)->id);
+ log_
unit_debug
(UNIT(t)->id, "%s got notified about unit deactivation.", UNIT(t)->id);
timer_enter_waiting(t, false);
}
break;
timer_enter_waiting(t, false);
}
break;
@@
-695,7
+709,7
@@
static void timer_time_change(Unit *u) {
if (t->state != TIMER_WAITING)
return;
if (t->state != TIMER_WAITING)
return;
- log_
debug_unit
(u->id, "%s: time change, recalculating next elapse.", u->id);
+ log_
unit_debug
(u->id, "%s: time change, recalculating next elapse.", u->id);
timer_enter_waiting(t, false);
}
timer_enter_waiting(t, false);
}