From: Lennart Poettering Date: Wed, 27 Jan 2010 05:33:27 +0000 (+0100) Subject: properly implement target unit X-Git-Tag: v1~787 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fa06836725dd6ec9f8f1c4b76608f7147008ecd9 properly implement target unit --- diff --git a/socket.c b/socket.c index 86104aa85..68a4d812d 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 bf448158c..6c84908e9 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 16cd9c449..273317828 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 {