X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=target.c;h=75f8ef8948db484817a53e6a30f1ad71e9645bcb;hp=e6f26f1412ad19ad63117a8603140d1a72b58852;hb=41160f3dbf0cb61e23a02338da1f289a2ff00066;hpb=9e2f7c11fb6ba35ffec2274da3e2d08b10d23965

diff --git a/target.c b/target.c
index e6f26f141..75f8ef894 100644
--- a/target.c
+++ b/target.c
@@ -26,24 +26,39 @@
 #include "target.h"
 #include "load-fragment.h"
 #include "log.h"
+#include "dbus-target.h"
 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = UNIT_INACTIVE,
         [TARGET_ACTIVE] = UNIT_ACTIVE
 };
 
-static const char* const state_string_table[_TARGET_STATE_MAX] = {
-        [TARGET_DEAD] = "dead",
-        [TARGET_ACTIVE] = "active"
-};
+static void target_set_state(Target *t, TargetState state) {
+        TargetState old_state;
+        assert(t);
+
+        old_state = t->state;
+        t->state = state;
+
+        if (state != old_state)
+                log_debug("%s changed %s -> %s",
+                          UNIT(t)->meta.id,
+                          target_state_to_string(old_state),
+                          target_state_to_string(state));
+
+        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
+}
 
-static void target_init(Unit *u) {
+static int target_coldplug(Unit *u) {
         Target *t = TARGET(u);
 
         assert(t);
-        assert(u->meta.load_state == UNIT_STUB);
+        assert(t->state == TARGET_DEAD);
 
-        t->state = 0;
+        if (t->deserialized_state != t->state)
+                target_set_state(t, t->deserialized_state);
+
+        return 0;
 }
 
 static void target_dump(Unit *u, FILE *f, const char *prefix) {
@@ -54,20 +69,7 @@ static void target_dump(Unit *u, FILE *f, const char *prefix) {
 
         fprintf(f,
                 "%sTarget State: %s\n",
-                prefix, state_string_table[t->state]);
-}
-
-static void target_set_state(Target *t, TargetState state) {
-        TargetState old_state;
-        assert(t);
-
-        old_state = t->state;
-        t->state = state;
-
-        if (state != old_state)
-                log_debug("%s changed %s → %s", UNIT(t)->meta.id, state_string_table[old_state], state_string_table[state]);
-
-        unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
+                prefix, target_state_to_string(t->state));
 }
 
 static int target_start(Unit *u) {
@@ -90,6 +92,39 @@ static int target_stop(Unit *u) {
         return 0;
 }
 
+static int target_serialize(Unit *u, FILE *f, FDSet *fds) {
+        Target *s = TARGET(u);
+
+        assert(s);
+        assert(f);
+        assert(fds);
+
+        unit_serialize_item(u, f, "state", target_state_to_string(s->state));
+        return 0;
+}
+
+static int target_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) {
+        Target *s = TARGET(u);
+
+        assert(u);
+        assert(key);
+        assert(value);
+        assert(fds);
+
+        if (streq(key, "state")) {
+                TargetState state;
+
+                if ((state = target_state_from_string(value)) < 0)
+                        log_debug("Failed to parse state value %s", value);
+                else
+                        s->deserialized_state = state;
+
+        } else
+                log_debug("Unknown serialization key '%s'", key);
+
+        return 0;
+}
+
 static UnitActiveState target_active_state(Unit *u) {
         assert(u);
 
@@ -99,7 +134,7 @@ static UnitActiveState target_active_state(Unit *u) {
 static const char *target_sub_state_to_string(Unit *u) {
         assert(u);
 
-        return state_string_table[TARGET(u)->state];
+        return target_state_to_string(TARGET(u)->state);
 }
 
 int target_get_runlevel(Target *t) {
@@ -131,17 +166,29 @@ int target_get_runlevel(Target *t) {
         return 0;
 }
 
+static const char* const target_state_table[_TARGET_STATE_MAX] = {
+        [TARGET_DEAD] = "dead",
+        [TARGET_ACTIVE] = "active"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(target_state, TargetState);
+
 const UnitVTable target_vtable = {
         .suffix = ".target",
 
-        .init = target_init,
         .load = unit_load_fragment_and_dropin,
+        .coldplug = target_coldplug,
 
         .dump = target_dump,
 
         .start = target_start,
         .stop = target_stop,
 
+        .serialize = target_serialize,
+        .deserialize_item = target_deserialize_item,
+
         .active_state = target_active_state,
-        .sub_state_to_string = target_sub_state_to_string
+        .sub_state_to_string = target_sub_state_to_string,
+
+        .bus_message_handler = bus_target_message_handler
 };