From: Lennart Poettering Date: Thu, 1 Jul 2010 01:34:15 +0000 (+0200) Subject: unit: shorten active state enums to make systemctl output nicer X-Git-Tag: v1~89 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=032ff4afc953cae076ce0ee6a0b85020eeb1a75a unit: shorten active state enums to make systemctl output nicer --- diff --git a/fixme b/fixme index 09aba7de0..2f0f929c7 100644 --- a/fixme +++ b/fixme @@ -35,16 +35,10 @@ * selinux -* systemctl check - -* nettere fehlermeldung bei systemctl start foo.service failure - -* systemd-install disable sollte den service runterfahren +* systemd-install disable sollte den service runterfahren, and daemon-reload machen * systemctl daemon-reload is kaputt -* keinerlei fehlermeldung bei dead symlink muss gefixt werden - External: * patch /etc/init.d/functions with: diff --git a/src/automount.c b/src/automount.c index 84f2d97ed..5e669c5d3 100644 --- a/src/automount.c +++ b/src/automount.c @@ -40,7 +40,7 @@ static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = { [AUTOMOUNT_DEAD] = UNIT_INACTIVE, [AUTOMOUNT_WAITING] = UNIT_ACTIVE, [AUTOMOUNT_RUNNING] = UNIT_ACTIVE, - [AUTOMOUNT_MAINTENANCE] = UNIT_INACTIVE_MAINTENANCE + [AUTOMOUNT_MAINTENANCE] = UNIT_MAINTENANCE }; static int open_dev_autofs(Manager *m); diff --git a/src/job.c b/src/job.c index 8273a39c3..31e9cfe8d 100644 --- a/src/job.c +++ b/src/job.c @@ -275,26 +275,26 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) { case JOB_START: return b == UNIT_ACTIVE || - b == UNIT_ACTIVE_RELOADING; + b == UNIT_RELOADING; case JOB_STOP: return b == UNIT_INACTIVE || - b == UNIT_INACTIVE_MAINTENANCE; + b == UNIT_MAINTENANCE; case JOB_VERIFY_ACTIVE: return b == UNIT_ACTIVE || - b == UNIT_ACTIVE_RELOADING; + b == UNIT_RELOADING; case JOB_RELOAD: return - b == UNIT_ACTIVE_RELOADING; + b == UNIT_RELOADING; case JOB_RELOAD_OR_START: return b == UNIT_ACTIVATING || - b == UNIT_ACTIVE_RELOADING; + b == UNIT_RELOADING; case JOB_RESTART: return @@ -416,7 +416,7 @@ int job_run_and_invalidate(Job *j) { case JOB_RESTART: { UnitActiveState t = unit_active_state(j->unit); - if (t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_ACTIVATING) { + if (t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_ACTIVATING) { j->type = JOB_START; r = unit_start(j->unit); } else @@ -426,7 +426,7 @@ int job_run_and_invalidate(Job *j) { case JOB_TRY_RESTART: { UnitActiveState t = unit_active_state(j->unit); - if (t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_DEACTIVATING) + if (t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_DEACTIVATING) r = -ENOEXEC; else if (t == UNIT_ACTIVATING) { j->type = JOB_START; diff --git a/src/mount.c b/src/mount.c index f0336163a..86c5b0a8c 100644 --- a/src/mount.c +++ b/src/mount.c @@ -42,15 +42,15 @@ static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = { [MOUNT_MOUNTING] = UNIT_ACTIVATING, [MOUNT_MOUNTING_DONE] = UNIT_ACTIVE, [MOUNT_MOUNTED] = UNIT_ACTIVE, - [MOUNT_REMOUNTING] = UNIT_ACTIVE_RELOADING, + [MOUNT_REMOUNTING] = UNIT_RELOADING, [MOUNT_UNMOUNTING] = UNIT_DEACTIVATING, [MOUNT_MOUNTING_SIGTERM] = UNIT_DEACTIVATING, [MOUNT_MOUNTING_SIGKILL] = UNIT_DEACTIVATING, - [MOUNT_REMOUNTING_SIGTERM] = UNIT_ACTIVE_RELOADING, - [MOUNT_REMOUNTING_SIGKILL] = UNIT_ACTIVE_RELOADING, + [MOUNT_REMOUNTING_SIGTERM] = UNIT_RELOADING, + [MOUNT_REMOUNTING_SIGKILL] = UNIT_RELOADING, [MOUNT_UNMOUNTING_SIGTERM] = UNIT_DEACTIVATING, [MOUNT_UNMOUNTING_SIGKILL] = UNIT_DEACTIVATING, - [MOUNT_MAINTENANCE] = UNIT_INACTIVE_MAINTENANCE + [MOUNT_MAINTENANCE] = UNIT_MAINTENANCE }; static void mount_init(Unit *u) { diff --git a/src/path.c b/src/path.c index 16ea08dde..80dc3c44d 100644 --- a/src/path.c +++ b/src/path.c @@ -34,7 +34,7 @@ static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = { [PATH_DEAD] = UNIT_INACTIVE, [PATH_WAITING] = UNIT_ACTIVE, [PATH_RUNNING] = UNIT_ACTIVE, - [PATH_MAINTENANCE] = UNIT_INACTIVE_MAINTENANCE + [PATH_MAINTENANCE] = UNIT_MAINTENANCE }; static void path_done(Unit *u) { diff --git a/src/service.c b/src/service.c index 3102acc08..d5e681a3f 100644 --- a/src/service.c +++ b/src/service.c @@ -76,14 +76,14 @@ static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_START_POST] = UNIT_ACTIVATING, [SERVICE_RUNNING] = UNIT_ACTIVE, [SERVICE_EXITED] = UNIT_ACTIVE, - [SERVICE_RELOAD] = UNIT_ACTIVE_RELOADING, + [SERVICE_RELOAD] = UNIT_RELOADING, [SERVICE_STOP] = UNIT_DEACTIVATING, [SERVICE_STOP_SIGTERM] = UNIT_DEACTIVATING, [SERVICE_STOP_SIGKILL] = UNIT_DEACTIVATING, [SERVICE_STOP_POST] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGTERM] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGKILL] = UNIT_DEACTIVATING, - [SERVICE_MAINTENANCE] = UNIT_INACTIVE_MAINTENANCE, + [SERVICE_MAINTENANCE] = UNIT_MAINTENANCE, [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING }; diff --git a/src/socket.c b/src/socket.c index 83f8ebe6a..7e62dbce9 100644 --- a/src/socket.c +++ b/src/socket.c @@ -50,7 +50,7 @@ static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = { [SOCKET_STOP_POST] = UNIT_DEACTIVATING, [SOCKET_FINAL_SIGTERM] = UNIT_DEACTIVATING, [SOCKET_FINAL_SIGKILL] = UNIT_DEACTIVATING, - [SOCKET_MAINTENANCE] = UNIT_INACTIVE_MAINTENANCE + [SOCKET_MAINTENANCE] = UNIT_MAINTENANCE }; static void socket_init(Unit *u) { diff --git a/src/swap.c b/src/swap.c index e2afcc02e..2e3e995c3 100644 --- a/src/swap.c +++ b/src/swap.c @@ -38,7 +38,7 @@ static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = { [SWAP_DEAD] = UNIT_INACTIVE, [SWAP_ACTIVE] = UNIT_ACTIVE, - [SWAP_MAINTENANCE] = UNIT_INACTIVE_MAINTENANCE + [SWAP_MAINTENANCE] = UNIT_MAINTENANCE }; static void swap_init(Unit *u) { diff --git a/src/timer.c b/src/timer.c index 96c6e8e8e..f0005f55c 100644 --- a/src/timer.c +++ b/src/timer.c @@ -31,7 +31,7 @@ static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = { [TIMER_WAITING] = UNIT_ACTIVE, [TIMER_RUNNING] = UNIT_ACTIVE, [TIMER_ELAPSED] = UNIT_ACTIVE, - [TIMER_MAINTENANCE] = UNIT_INACTIVE_MAINTENANCE + [TIMER_MAINTENANCE] = UNIT_MAINTENANCE }; static void timer_init(Unit *u) { diff --git a/src/unit.c b/src/unit.c index 79b9e2bb8..9fed5a0f4 100644 --- a/src/unit.c +++ b/src/unit.c @@ -819,7 +819,7 @@ int unit_reload(Unit *u) { return -EBADR; state = unit_active_state(u); - if (unit_active_state(u) == UNIT_ACTIVE_RELOADING) + if (unit_active_state(u) == UNIT_RELOADING) return -EALREADY; if (unit_active_state(u) != UNIT_ACTIVE) @@ -998,7 +998,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) { if (u->meta.job->state == JOB_RUNNING) { if (ns == UNIT_ACTIVE) job_finish_and_invalidate(u->meta.job, true); - else if (ns != UNIT_ACTIVATING && ns != UNIT_ACTIVE_RELOADING) { + else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) { unexpected = true; job_finish_and_invalidate(u->meta.job, false); } @@ -1012,7 +1012,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) { if (ns == UNIT_INACTIVE) job_finish_and_invalidate(u->meta.job, true); - else if (ns == UNIT_INACTIVE_MAINTENANCE) + else if (ns == UNIT_MAINTENANCE) job_finish_and_invalidate(u->meta.job, false); else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) { unexpected = true; @@ -1964,9 +1964,9 @@ DEFINE_STRING_TABLE_LOOKUP(unit_load_state, UnitLoadState); static const char* const unit_active_state_table[_UNIT_ACTIVE_STATE_MAX] = { [UNIT_ACTIVE] = "active", - [UNIT_ACTIVE_RELOADING] = "active-reloading", + [UNIT_RELOADING] = "reloading", [UNIT_INACTIVE] = "inactive", - [UNIT_INACTIVE_MAINTENANCE] = "inactive-maintenance", + [UNIT_MAINTENANCE] = "maintenance", [UNIT_ACTIVATING] = "activating", [UNIT_DEACTIVATING] = "deactivating" }; diff --git a/src/unit.h b/src/unit.h index 03031892d..aa80aadb1 100644 --- a/src/unit.h +++ b/src/unit.h @@ -78,9 +78,9 @@ enum UnitLoadState { enum UnitActiveState { UNIT_ACTIVE, - UNIT_ACTIVE_RELOADING, + UNIT_RELOADING, UNIT_INACTIVE, - UNIT_INACTIVE_MAINTENANCE, + UNIT_MAINTENANCE, UNIT_ACTIVATING, UNIT_DEACTIVATING, _UNIT_ACTIVE_STATE_MAX, @@ -88,19 +88,19 @@ enum UnitActiveState { }; static inline bool UNIT_IS_ACTIVE_OR_RELOADING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_RELOADING; } static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_RELOADING; } static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) { - return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE || t == UNIT_DEACTIVATING; + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_DEACTIVATING; } static inline bool UNIT_IS_INACTIVE_OR_MAINTENANCE(UnitActiveState t) { - return t == UNIT_INACTIVE || t == UNIT_INACTIVE_MAINTENANCE; + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE; } enum UnitDependency {