X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=target.c;h=75f8ef8948db484817a53e6a30f1ad71e9645bcb;hp=b18e50fe5bdf756e49f8bee3fd657ff14f2f7fb5;hb=31cee6f634ce07aa2c3514a506f93830f91f14a5;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6

diff --git a/target.c b/target.c
index b18e50fe5..75f8ef894 100644
--- a/target.c
+++ b/target.c
@@ -20,30 +20,43 @@
 ***/
 
 #include <errno.h>
+#include <signal.h>
 
 #include "unit.h"
 #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);
 
-static int target_init(Unit *u) {
-        int r;
-        assert(u);
+        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 int target_coldplug(Unit *u) {
+        Target *t = TARGET(u);
 
-        /* Make sure this config file actually exists */
+        assert(t);
+        assert(t->state == TARGET_DEAD);
 
-        if ((r = unit_load_fragment_and_dropin(u)) <= 0)
-                return r < 0 ? r : -ENOENT;
+        if (t->deserialized_state != t->state)
+                target_set_state(t, t->deserialized_state);
 
         return 0;
 }
@@ -56,19 +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;
-
-        log_debug("%s changed %s → %s", unit_id(UNIT(t)), 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) {
@@ -91,21 +92,103 @@ 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);
 
         return state_translation_table[TARGET(u)->state];
 }
 
+static const char *target_sub_state_to_string(Unit *u) {
+        assert(u);
+
+        return target_state_to_string(TARGET(u)->state);
+}
+
+int target_get_runlevel(Target *t) {
+
+        static const struct {
+                const char *special;
+                const int runlevel;
+        } table[] = {
+                { SPECIAL_RUNLEVEL5_TARGET, '5' },
+                { SPECIAL_RUNLEVEL4_TARGET, '4' },
+                { SPECIAL_RUNLEVEL3_TARGET, '3' },
+                { SPECIAL_RUNLEVEL2_TARGET, '2' },
+                { SPECIAL_RUNLEVEL1_TARGET, '1' },
+                { SPECIAL_RUNLEVEL0_TARGET, '0' },
+                { SPECIAL_RUNLEVEL6_TARGET, '6' },
+        };
+
+        unsigned i;
+
+        assert(t);
+
+        /* Tries to determine if this is a SysV runlevel and returns
+         * it if that is so. */
+
+        for (i = 0; i < ELEMENTSOF(table); i++)
+                if (unit_has_name(UNIT(t), table[i].special))
+                        return table[i].runlevel;
+
+        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,
 
-        .active_state = target_active_state
+        .serialize = target_serialize,
+        .deserialize_item = target_deserialize_item,
+
+        .active_state = target_active_state,
+        .sub_state_to_string = target_sub_state_to_string,
+
+        .bus_message_handler = bus_target_message_handler
 };