[systemd-devel] [PATCH 2/3] timer: timer can be a transient unit
WaLyong Cho
walyong.cho at samsung.com
Mon Oct 6 22:20:09 PDT 2014
---
src/core/dbus-timer.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++
src/core/dbus-timer.h | 3 ++
src/core/timer.c | 10 ++++
3 files changed, 153 insertions(+)
diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index f1f8c54..5f0b80e 100644
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -24,6 +24,7 @@
#include "dbus-unit.h"
#include "dbus-timer.h"
#include "bus-util.h"
+#include "errno-list.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, timer_result, TimerResult);
@@ -183,3 +184,142 @@ const sd_bus_vtable bus_timer_vtable[] = {
SD_BUS_PROPERTY("WakeSystem", "b", bus_property_get_bool, offsetof(Timer, wake_system), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_VTABLE_END
};
+
+static int bus_timer_set_transient_property(
+ Timer *t,
+ const char *name,
+ sd_bus_message *message,
+ UnitSetPropertiesMode mode,
+ sd_bus_error *error) {
+
+ const char *str;
+ int r;
+
+ assert(t);
+ assert(name);
+ assert(message);
+
+ if (streq(name, "OnActiveSec") ||
+ streq(name, "OnBootSec") ||
+ streq(name, "OnStartupSec") ||
+ streq(name, "OnUnitActiveSec") ||
+ streq(name, "OnUnitInactiveSec")) {
+
+ TimerValue *v;
+ TimerBase b = _TIMER_BASE_INVALID;
+ usec_t u = 0;
+ CalendarSpec *c = NULL;
+
+ b = timer_base_from_string(name);
+ if (b < 0)
+ return 0;
+
+ r = sd_bus_message_read(message, "s", &str);
+ if (r < 0)
+ return r;
+
+ if (mode != UNIT_CHECK) {
+ if (b == TIMER_CALENDAR) {
+ r = calendar_spec_from_string(str, &c);
+ if (r < 0)
+ return r;
+ } else {
+ r = parse_sec(str, &u);
+ if (r < 0)
+ return r;
+ }
+
+ unit_write_drop_in_private_format(UNIT(t),
+ mode,
+ name,
+ "%s=%s\n",
+ name,
+ str);
+
+ v = new0(TimerValue, 1);
+ if (!v) {
+ if (c)
+ calendar_spec_free(c);
+ return -ENOMEM;
+ }
+
+ v->base = b;
+ v->value = u;
+ v->calendar_spec = c;
+
+ LIST_PREPEND(value, t->values, v);
+ }
+
+ return 1;
+
+ } else if (streq(name, "AccuracySec")) {
+
+ usec_t u = 0;
+
+ r = sd_bus_message_read(message, "s", &str);
+ if (r < 0)
+ return r;
+
+ r = parse_sec(str, &u);
+ if (r < 0)
+ return r;
+
+ if (mode != UNIT_CHECK) {
+ t->accuracy_usec = u;
+ unit_write_drop_in_private_format(UNIT(t),
+ mode,
+ name,
+ "%s=%s\n",
+ name,
+ str);
+ }
+
+ return 1;
+
+ } else if (streq(name, "WakeSystem")) {
+
+ int b;
+
+ r = sd_bus_message_read(message, "b", &b);
+ if (r < 0)
+ return r;
+
+ if (mode != UNIT_CHECK) {
+ t->wake_system = b;
+ unit_write_drop_in_private_format(UNIT(t),
+ mode,
+ name,
+ "%s=%s\n",
+ name,
+ yes_no(t->wake_system));
+ }
+
+ return 1;
+
+ }
+
+ return 0;
+}
+
+int bus_timer_set_property(
+ Unit *u,
+ const char *name,
+ sd_bus_message *message,
+ UnitSetPropertiesMode mode,
+ sd_bus_error *error) {
+
+ Timer *t = TIMER(u);
+ int r;
+
+ assert(t);
+ assert(name);
+ assert(message);
+
+ if (u->transient && u->load_state == UNIT_STUB) {
+ r = bus_timer_set_transient_property(t, name, message, mode, error);
+ if (r != 0)
+ return r;
+ }
+
+ return 0;
+}
diff --git a/src/core/dbus-timer.h b/src/core/dbus-timer.h
index cfff88e..103172f 100644
--- a/src/core/dbus-timer.h
+++ b/src/core/dbus-timer.h
@@ -22,5 +22,8 @@
***/
#include "sd-bus.h"
+#include "unit.h"
extern const sd_bus_vtable bus_timer_vtable[];
+
+int bus_timer_set_property(Unit *u, const char *name, sd_bus_message *i, UnitSetPropertiesMode mode, sd_bus_error *error);
diff --git a/src/core/timer.c b/src/core/timer.c
index a3713e2..bad66ff 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -528,6 +528,12 @@ static int timer_start(Unit *u) {
if (UNIT_TRIGGER(u)->load_state != UNIT_LOADED)
return -ENOENT;
+ /* If trigger unit is transient, make sure be gabage
+ * collected. That maybe have no_gc to wait until this timer
+ * is started. */
+ if (UNIT_TRIGGER(u)->transient)
+ UNIT_TRIGGER(u)->no_gc = false;
+
t->last_trigger = DUAL_TIMESTAMP_NULL;
if (t->stamp_path) {
@@ -744,6 +750,7 @@ const UnitVTable timer_vtable = {
"Unit\0"
"Timer\0"
"Install\0",
+ .private_section = "Timer",
.init = timer_init,
.done = timer_done,
@@ -769,4 +776,7 @@ const UnitVTable timer_vtable = {
.bus_interface = "org.freedesktop.systemd1.Timer",
.bus_vtable = bus_timer_vtable,
+ .bus_set_property = bus_timer_set_property,
+
+ .can_transient = true,
};
--
1.9.3
More information about the systemd-devel
mailing list