chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
login: add new sd_session_get_type() and sd_session_get_class API calls
[elogind.git]
/
src
/
timer.c
diff --git
a/src/timer.c
b/src/timer.c
index 1580478949595cd0a6006fd0360ad8103d497efc..e318fee2010eb927f32d538fa6bd872221bd265a 100644
(file)
--- 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.
/***
This file is part of systemd.
@@
-33,14
+33,14
@@
static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
[TIMER_WAITING] = UNIT_ACTIVE,
[TIMER_RUNNING] = UNIT_ACTIVE,
[TIMER_ELAPSED] = UNIT_ACTIVE,
[TIMER_WAITING] = UNIT_ACTIVE,
[TIMER_RUNNING] = UNIT_ACTIVE,
[TIMER_ELAPSED] = UNIT_ACTIVE,
- [TIMER_
MAINTENANCE] = UNIT_MAINTENANCE
+ [TIMER_
FAILED] = UNIT_FAILED
};
static void timer_init(Unit *u) {
Timer *t = TIMER(u);
assert(u);
};
static void timer_init(Unit *u) {
Timer *t = TIMER(u);
assert(u);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
t->next_elapse = (usec_t) -1;
}
t->next_elapse = (usec_t) -1;
}
@@
-57,16
+57,18
@@
static void timer_done(Unit *u) {
}
unit_unwatch_timer(u, &t->timer_watch);
}
unit_unwatch_timer(u, &t->timer_watch);
+
+ unit_ref_unset(&t->unit);
}
static int timer_verify(Timer *t) {
assert(t);
}
static int timer_verify(Timer *t) {
assert(t);
- if (
t->meta.
load_state != UNIT_LOADED)
+ if (
UNIT(t)->
load_state != UNIT_LOADED)
return 0;
if (!t->values) {
return 0;
if (!t->values) {
- log_error("%s lacks value setting. Refusing.",
t->meta.
id);
+ log_error("%s lacks value setting. Refusing.",
UNIT(t)->
id);
return -EINVAL;
}
return -EINVAL;
}
@@
-78,9
+80,13
@@
static int timer_add_default_dependencies(Timer *t) {
assert(t);
assert(t);
- if (t->meta.manager->running_as == MANAGER_SYSTEM)
+ if (UNIT(t)->manager->running_as == MANAGER_SYSTEM) {
+ if ((r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
+ return r;
+
if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
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_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
@@
-90,21
+96,28
@@
static int timer_load(Unit *u) {
int r;
assert(u);
int r;
assert(u);
- assert(u->
meta.
load_state == UNIT_STUB);
+ assert(u->load_state == UNIT_STUB);
if ((r = unit_load_fragment_and_dropin(u)) < 0)
return r;
if ((r = unit_load_fragment_and_dropin(u)) < 0)
return r;
- if (u->
meta.
load_state == UNIT_LOADED) {
+ if (u->load_state == UNIT_LOADED) {
- if (!t->unit)
- if ((r = unit_load_related_unit(u, ".service", &t->unit)))
+ if (!UNIT_DEREF(t->unit)) {
+ Unit *x;
+
+ r = unit_load_related_unit(u, ".service", &x);
+ if (r < 0)
return r;
return r;
- if ((r = unit_add_dependency(u, UNIT_BEFORE, t->unit, true)) < 0)
+ unit_ref_set(&t->unit, x);
+ }
+
+ r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(t->unit), true);
+ if (r < 0)
return r;
return r;
- if (
t->meta.
default_dependencies)
+ if (
UNIT(t)->
default_dependencies)
if ((r = timer_add_default_dependencies(t)) < 0)
return r;
}
if ((r = timer_add_default_dependencies(t)) < 0)
return r;
}
@@
-114,20
+127,17
@@
static int timer_load(Unit *u) {
static void timer_dump(Unit *u, FILE *f, const char *prefix) {
Timer *t = TIMER(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];
TimerValue *v;
char
timespan1[FORMAT_TIMESPAN_MAX];
- p2 = strappend(prefix, "\t");
- prefix2 = p2 ? p2 : prefix;
-
fprintf(f,
"%sTimer State: %s\n"
fprintf(f,
"%sTimer State: %s\n"
+ "%sResult: %s\n"
"%sUnit: %s\n",
prefix, timer_state_to_string(t->state),
"%sUnit: %s\n",
prefix, timer_state_to_string(t->state),
- prefix, t->unit->meta.id);
+ prefix, timer_result_to_string(t->result),
+ prefix, UNIT_DEREF(t->unit)->id);
LIST_FOREACH(value, v, t->values)
fprintf(f,
LIST_FOREACH(value, v, t->values)
fprintf(f,
@@
-135,8
+145,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)));
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) {
}
static void timer_set_state(Timer *t, TimerState state) {
@@
-151,11
+159,11
@@
static void timer_set_state(Timer *t, TimerState state) {
if (state != old_state)
log_debug("%s changed %s -> %s",
if (state != old_state)
log_debug("%s changed %s -> %s",
-
t->meta.
id,
+
UNIT(t)->
id,
timer_state_to_string(old_state),
timer_state_to_string(state));
timer_state_to_string(old_state),
timer_state_to_string(state));
- unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
+ unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]
, true
);
}
static void timer_enter_waiting(Timer *t, bool initial);
}
static void timer_enter_waiting(Timer *t, bool initial);
@@
-168,9
+176,7
@@
static int timer_coldplug(Unit *u) {
if (t->deserialized_state != t->state) {
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);
timer_enter_waiting(t, false);
else
timer_set_state(t, t->deserialized_state);
@@
-179,13
+185,13
@@
static int timer_coldplug(Unit *u) {
return 0;
}
return 0;
}
-static void timer_enter_dead(Timer *t,
bool success
) {
+static void timer_enter_dead(Timer *t,
TimerResult f
) {
assert(t);
assert(t);
- if (
!success
)
- t->
failure = true
;
+ if (
f != TIMER_SUCCESS
)
+ t->
result = f
;
- timer_set_state(t, t->
failure ? TIMER_MAINTENANCE
: TIMER_DEAD);
+ timer_set_state(t, t->
result != TIMER_SUCCESS ? TIMER_FAILED
: TIMER_DEAD);
}
static void timer_enter_waiting(Timer *t, bool initial) {
}
static void timer_enter_waiting(Timer *t, bool initial) {
@@
-204,9
+210,9
@@
static void timer_enter_waiting(Timer *t, bool initial) {
switch (v->base) {
case TIMER_ACTIVE:
switch (v->base) {
case TIMER_ACTIVE:
- if (state_translation_table[t->state] == UNIT_ACTIVE)
{
- base =
t->meta.
inactive_exit_timestamp.monotonic;
-
}
else
+ if (state_translation_table[t->state] == UNIT_ACTIVE)
+ base =
UNIT(t)->
inactive_exit_timestamp.monotonic;
+ else
base = n;
break;
base = n;
break;
@@
-216,23
+222,23
@@
static void timer_enter_waiting(Timer *t, bool initial) {
break;
case TIMER_STARTUP:
break;
case TIMER_STARTUP:
- base =
t->meta.
manager->startup_timestamp.monotonic;
+ base =
UNIT(t)->
manager->startup_timestamp.monotonic;
break;
case TIMER_UNIT_ACTIVE:
break;
case TIMER_UNIT_ACTIVE:
- if (
t->unit->meta.
inactive_exit_timestamp.monotonic <= 0)
+ if (
UNIT_DEREF(t->unit)->
inactive_exit_timestamp.monotonic <= 0)
continue;
continue;
- base =
t->unit->meta.
inactive_exit_timestamp.monotonic;
+ base =
UNIT_DEREF(t->unit)->
inactive_exit_timestamp.monotonic;
break;
case TIMER_UNIT_INACTIVE:
break;
case TIMER_UNIT_INACTIVE:
- if (
t->unit->meta.
inactive_enter_timestamp.monotonic <= 0)
+ if (
UNIT_DEREF(t->unit)->
inactive_enter_timestamp.monotonic <= 0)
continue;
continue;
- base =
t->unit->meta.
inactive_enter_timestamp.monotonic;
+ base =
UNIT_DEREF(t->unit)->
inactive_enter_timestamp.monotonic;
break;
default:
break;
default:
@@
-268,8
+274,8
@@
static void timer_enter_waiting(Timer *t, bool initial) {
return;
fail:
return;
fail:
- log_warning("%s failed to enter waiting state: %s",
t->meta.
id, strerror(-r));
- timer_enter_dead(t,
false
);
+ log_warning("%s failed to enter waiting state: %s",
UNIT(t)->
id, strerror(-r));
+ timer_enter_dead(t,
TIMER_FAILURE_RESOURCES
);
}
static void timer_enter_running(Timer *t) {
}
static void timer_enter_running(Timer *t) {
@@
-280,18
+286,18
@@
static void timer_enter_running(Timer *t) {
dbus_error_init(&error);
/* Don't start job if we are supposed to go down */
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)
+ if (
UNIT(t)->job && UNIT(t)->
job->type == JOB_STOP)
return;
return;
- if ((r = manager_add_job(
t->meta.manager, JOB_START, t->unit
, JOB_REPLACE, true, &error, NULL)) < 0)
+ if ((r = manager_add_job(
UNIT(t)->manager, JOB_START, UNIT_DEREF(t->unit)
, JOB_REPLACE, true, &error, NULL)) < 0)
goto fail;
timer_set_state(t, TIMER_RUNNING);
return;
fail:
goto fail;
timer_set_state(t, TIMER_RUNNING);
return;
fail:
- log_warning("%s failed to queue unit startup job: %s",
t->meta.
id, bus_error(&error, r));
- timer_enter_dead(t,
false
);
+ log_warning("%s failed to queue unit startup job: %s",
UNIT(t)->
id, bus_error(&error, r));
+ timer_enter_dead(t,
TIMER_FAILURE_RESOURCES
);
dbus_error_free(&error);
}
dbus_error_free(&error);
}
@@
-300,12
+306,12
@@
static int timer_start(Unit *u) {
Timer *t = TIMER(u);
assert(t);
Timer *t = TIMER(u);
assert(t);
- assert(t->state == TIMER_DEAD || t->state == TIMER_
MAINTENANCE
);
+ assert(t->state == TIMER_DEAD || t->state == TIMER_
FAILED
);
- if (
t->unit->meta.
load_state != UNIT_LOADED)
+ if (
UNIT_DEREF(t->unit)->
load_state != UNIT_LOADED)
return -ENOENT;
return -ENOENT;
- t->
failure = false
;
+ t->
result = TIMER_SUCCESS
;
timer_enter_waiting(t, true);
return 0;
}
timer_enter_waiting(t, true);
return 0;
}
@@
-316,7
+322,7
@@
static int timer_stop(Unit *u) {
assert(t);
assert(t->state == TIMER_WAITING || t->state == TIMER_RUNNING || t->state == TIMER_ELAPSED);
assert(t);
assert(t->state == TIMER_WAITING || t->state == TIMER_RUNNING || t->state == TIMER_ELAPSED);
- timer_enter_dead(t,
true
);
+ timer_enter_dead(t,
TIMER_SUCCESS
);
return 0;
}
return 0;
}
@@
-328,6
+334,7
@@
static int timer_serialize(Unit *u, FILE *f, FDSet *fds) {
assert(fds);
unit_serialize_item(u, f, "state", timer_state_to_string(t->state));
assert(fds);
unit_serialize_item(u, f, "state", timer_state_to_string(t->state));
+ unit_serialize_item(u, f, "result", timer_result_to_string(t->result));
return 0;
}
return 0;
}
@@
-347,6
+354,15
@@
static int timer_deserialize_item(Unit *u, const char *key, const char *value, F
log_debug("Failed to parse state value %s", value);
else
t->deserialized_state = state;
log_debug("Failed to parse state value %s", value);
else
t->deserialized_state = state;
+ } else if (streq(key, "result")) {
+ TimerResult f;
+
+ f = timer_result_from_string(value);
+ if (f < 0)
+ log_debug("Failed to parse result value %s", value);
+ else if (f != TIMER_SUCCESS)
+ t->result = f;
+
} else
log_debug("Unknown serialization key '%s'", key);
} else
log_debug("Unknown serialization key '%s'", key);
@@
-374,42
+390,28
@@
static void timer_timer_event(Unit *u, uint64_t elapsed, Watch *w) {
if (t->state != TIMER_WAITING)
return;
if (t->state != TIMER_WAITING)
return;
- log_debug("Timer elapsed on %s", u->
meta.
id);
+ log_debug("Timer elapsed on %s", u->id);
timer_enter_running(t);
}
void timer_unit_notify(Unit *u, UnitActiveState new_state) {
timer_enter_running(t);
}
void timer_unit_notify(Unit *u, UnitActiveState new_state) {
- char *n;
- int r;
Iterator i;
Iterator i;
+ Unit *k;
- if (u->
meta.
type == UNIT_TIMER)
+ if (u->type == UNIT_TIMER)
return;
return;
- SET_FOREACH(n, u->meta.names, i) {
- char *k;
- Unit *p;
+ SET_FOREACH(k, u->dependencies[UNIT_TRIGGERED_BY], i) {
Timer *t;
TimerValue *v;
Timer *t;
TimerValue *v;
- if (!(k = unit_name_change_suffix(n, ".timer"))) {
- r = -ENOMEM;
- goto fail;
- }
-
- p = manager_get_unit(u->meta.manager, k);
- free(k);
-
- if (!p)
+ if (k->type != UNIT_TIMER)
continue;
continue;
- if (
p->meta.
load_state != UNIT_LOADED)
+ if (
k->
load_state != UNIT_LOADED)
continue;
continue;
- t = TIMER(p);
-
- if (t->unit != u)
- continue;
+ t = TIMER(k);
/* Reenable all timers that depend on unit state */
LIST_FOREACH(value, v, t->values)
/* Reenable all timers that depend on unit state */
LIST_FOREACH(value, v, t->values)
@@
-428,26
+430,32
@@
void timer_unit_notify(Unit *u, UnitActiveState new_state) {
case TIMER_RUNNING:
case TIMER_RUNNING:
- if (UNIT_IS_INACTIVE_OR_
MAINTENANCE
(new_state)) {
- log_debug("%s got notified about unit deactivation.",
t->meta.
id);
+ if (UNIT_IS_INACTIVE_OR_
FAILED
(new_state)) {
+ log_debug("%s got notified about unit deactivation.",
UNIT(t)->
id);
timer_enter_waiting(t, false);
}
break;
case TIMER_DEAD:
timer_enter_waiting(t, false);
}
break;
case TIMER_DEAD:
- case TIMER_
MAINTENANCE
:
- ;
+ case TIMER_
FAILED
:
+
break
;
default:
assert_not_reached("Unknown timer state");
}
}
default:
assert_not_reached("Unknown timer state");
}
}
+}
- return;
+static void timer_reset_failed(Unit *u) {
+ Timer *t = TIMER(u);
-fail:
- log_error("Failed find timer unit: %s", strerror(-r));
+ assert(t);
+
+ if (t->state == TIMER_FAILED)
+ timer_set_state(t, TIMER_DEAD);
+
+ t->result = TIMER_SUCCESS;
}
static const char* const timer_state_table[_TIMER_STATE_MAX] = {
}
static const char* const timer_state_table[_TIMER_STATE_MAX] = {
@@
-455,7
+463,7
@@
static const char* const timer_state_table[_TIMER_STATE_MAX] = {
[TIMER_WAITING] = "waiting",
[TIMER_RUNNING] = "running",
[TIMER_ELAPSED] = "elapsed",
[TIMER_WAITING] = "waiting",
[TIMER_RUNNING] = "running",
[TIMER_ELAPSED] = "elapsed",
- [TIMER_
MAINTENANCE] = "maintenance
"
+ [TIMER_
FAILED] = "failed
"
};
DEFINE_STRING_TABLE_LOOKUP(timer_state, TimerState);
};
DEFINE_STRING_TABLE_LOOKUP(timer_state, TimerState);
@@
-470,8
+478,20
@@
static const char* const timer_base_table[_TIMER_BASE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(timer_base, TimerBase);
DEFINE_STRING_TABLE_LOOKUP(timer_base, TimerBase);
+static const char* const timer_result_table[_TIMER_RESULT_MAX] = {
+ [TIMER_SUCCESS] = "success",
+ [TIMER_FAILURE_RESOURCES] = "resources"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(timer_result, TimerResult);
+
const UnitVTable timer_vtable = {
.suffix = ".timer",
const UnitVTable timer_vtable = {
.suffix = ".timer",
+ .object_size = sizeof(Timer),
+ .sections =
+ "Unit\0"
+ "Timer\0"
+ "Install\0",
.init = timer_init,
.done = timer_done,
.init = timer_init,
.done = timer_done,
@@
-492,5
+512,9
@@
const UnitVTable timer_vtable = {
.timer_event = timer_timer_event,
.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
};
};