summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-01-27 06:33:27 +0100
committerLennart Poettering <lennart@poettering.net>2010-01-27 06:33:27 +0100
commitfa06836725dd6ec9f8f1c4b76608f7147008ecd9 (patch)
treea94cc9f079b8d61ad286d64f19a19d0519eba6b0
parent836698b90be5ce5e8aae86f39d03614260ffde5d (diff)
properly implement target unit
-rw-r--r--socket.c1
-rw-r--r--target.c64
-rw-r--r--target.h3
3 files changed, 61 insertions, 7 deletions
diff --git a/socket.c b/socket.c
index 86104aa85a..68a4d812d6 100644
--- a/socket.c
+++ b/socket.c
@@ -140,6 +140,7 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) {
char *prefix2;
assert(s);
+ assert(f);
prefix2 = strappend(prefix, "\t");
if (!prefix2)
diff --git a/target.c b/target.c
index bf448158cb..6c84908e9b 100644
--- a/target.c
+++ b/target.c
@@ -3,24 +3,76 @@
#include "unit.h"
#include "target.h"
#include "load-fragment.h"
+#include "log.h"
-static void target_done(Unit *u) {
- Target *m = TARGET(u);
+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_dump(Unit *u, FILE *f, const char *prefix) {
+ Target *t = TARGET(u);
+
+ assert(t);
+ assert(f);
+
+ 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 changing %s → %s", unit_id(UNIT(t)), state_string_table[old_state], state_string_table[state]);
- assert(m);
+ unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
+}
+
+static int target_start(Unit *u) {
+ Target *t = TARGET(u);
+
+ assert(t);
+ assert(t->state == TARGET_DEAD);
+
+ target_set_state(t, TARGET_ACTIVE);
+ return 0;
+}
- /* Nothing here for now */
+static int target_stop(Unit *u) {
+ Target *t = TARGET(u);
+
+ assert(t);
+ assert(t->state == TARGET_ACTIVE);
+
+ target_set_state(t, TARGET_DEAD);
+ return 0;
}
static UnitActiveState target_active_state(Unit *u) {
- return TARGET(u)->state == TARGET_DEAD ? UNIT_INACTIVE : UNIT_ACTIVE;
+ assert(u);
+
+ return state_translation_table[TARGET(u)->state];
}
const UnitVTable target_vtable = {
.suffix = ".target",
.init = unit_load_fragment_and_dropin,
- .done = target_done,
+
+ .dump = target_dump,
+
+ .start = target_start,
+ .stop = target_stop,
.active_state = target_active_state
};
diff --git a/target.h b/target.h
index 16cd9c4492..2733178286 100644
--- a/target.h
+++ b/target.h
@@ -9,7 +9,8 @@ typedef struct Target Target;
typedef enum TargetState {
TARGET_DEAD,
- TARGET_ACTIVE
+ TARGET_ACTIVE,
+ _TARGET_STATE_MAX
} TargetState;
struct Target {