chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add test for unit name printing
[elogind.git]
/
src
/
core
/
timer.c
diff --git
a/src/core/timer.c
b/src/core/timer.c
index 31ef176e7e3d750c8867bc94d96d32063494262c..8061f79e3aefddd31937eb49ce8ca7f874d7947c 100644
(file)
--- a/
src/core/timer.c
+++ b/
src/core/timer.c
@@
-48,8
+48,7
@@
static void timer_init(Unit *u) {
watch_init(&t->realtime_watch);
}
watch_init(&t->realtime_watch);
}
-static void timer_done(Unit *u) {
- Timer *t = TIMER(u);
+void timer_free_values(Timer *t) {
TimerValue *v;
assert(t);
TimerValue *v;
assert(t);
@@
-62,6
+61,14
@@
static void timer_done(Unit *u) {
free(v);
}
free(v);
}
+}
+
+static void timer_done(Unit *u) {
+ Timer *t = TIMER(u);
+
+ assert(t);
+
+ timer_free_values(t);
unit_unwatch_timer(u, &t->monotonic_watch);
unit_unwatch_timer(u, &t->realtime_watch);
unit_unwatch_timer(u, &t->monotonic_watch);
unit_unwatch_timer(u, &t->realtime_watch);
@@
-323,7
+330,7
@@
static void timer_enter_waiting(Timer *t, bool initial) {
log_debug_unit(UNIT(t)->id,
"%s: Monotonic timer elapses in %s the next time.",
UNIT(t)->id,
log_debug_unit(UNIT(t)->id,
"%s: Monotonic timer elapses in %s the next time.",
UNIT(t)->id,
- format_timespan(buf, sizeof(buf), t->next_elapse_monotonic
- ts.monotonic
));
+ format_timespan(buf, sizeof(buf), t->next_elapse_monotonic
> ts.monotonic ? t->next_elapse_monotonic - ts.monotonic : 0
));
r = unit_watch_timer(UNIT(t), CLOCK_MONOTONIC, false, t->next_elapse_monotonic, &t->monotonic_watch);
if (r < 0)
r = unit_watch_timer(UNIT(t), CLOCK_MONOTONIC, false, t->next_elapse_monotonic, &t->monotonic_watch);
if (r < 0)