chiark / gitweb /
execute: simplify appending to execution list
[elogind.git] / service.c
index 1e4824d436f69c56297259e61927b049e5a93376..67950d4e649d587cf7f77930c926eee2093da7d7 100644 (file)
--- a/service.c
+++ b/service.c
@@ -1,33 +1,52 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <errno.h>
 #include <signal.h>
 
-#include "name.h"
+#include "unit.h"
 #include "service.h"
 #include "load-fragment.h"
 #include "load-dropin.h"
 #include "log.h"
 
-static const NameActiveState state_table[_SERVICE_STATE_MAX] = {
-        [SERVICE_DEAD] = NAME_INACTIVE,
-        [SERVICE_START_PRE] = NAME_ACTIVATING,
-        [SERVICE_START] = NAME_ACTIVATING,
-        [SERVICE_START_POST] = NAME_ACTIVATING,
-        [SERVICE_RUNNING] = NAME_ACTIVE,
-        [SERVICE_RELOAD] = NAME_ACTIVE_RELOADING,
-        [SERVICE_STOP] = NAME_DEACTIVATING,
-        [SERVICE_STOP_SIGTERM] = NAME_DEACTIVATING,
-        [SERVICE_STOP_SIGKILL] = NAME_DEACTIVATING,
-        [SERVICE_STOP_POST] = NAME_DEACTIVATING,
-        [SERVICE_FINAL_SIGTERM] = NAME_DEACTIVATING,
-        [SERVICE_FINAL_SIGKILL] = NAME_DEACTIVATING,
-        [SERVICE_MAINTAINANCE] = NAME_INACTIVE,
-        [SERVICE_AUTO_RESTART] = NAME_ACTIVATING,
+static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
+        [SERVICE_DEAD] = UNIT_INACTIVE,
+        [SERVICE_START_PRE] = UNIT_ACTIVATING,
+        [SERVICE_START] = UNIT_ACTIVATING,
+        [SERVICE_START_POST] = UNIT_ACTIVATING,
+        [SERVICE_RUNNING] = UNIT_ACTIVE,
+        [SERVICE_RELOAD] = UNIT_ACTIVE_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_MAINTAINANCE] = UNIT_INACTIVE,
+        [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING,
 };
 
-static void service_done(Name *n) {
-        Service *s = SERVICE(n);
+static void service_done(Unit *u) {
+        Service *s = SERVICE(u);
 
         assert(s);
 
@@ -41,16 +60,16 @@ static void service_done(Name *n) {
         /* This will leak a process, but at least no memory or any of
          * our resources */
         if (s->main_pid > 0) {
-                name_unwatch_pid(n, s->main_pid);
+                unit_unwatch_pid(u, s->main_pid);
                 s->main_pid = 0;
         }
 
         if (s->control_pid > 0) {
-                name_unwatch_pid(n, s->control_pid);
+                unit_unwatch_pid(u, s->control_pid);
                 s->control_pid = 0;
         }
 
-        name_unwatch_timer(n, &s->timer_id);
+        unit_unwatch_timer(u, &s->timer_watch);
 }
 
 static int service_load_sysv(Service *s) {
@@ -62,9 +81,9 @@ static int service_load_sysv(Service *s) {
         return -ENOENT;
 }
 
-static int service_init(Name *n) {
+static int service_init(Unit *u) {
         int r;
-        Service *s = SERVICE(n);
+        Service *s = SERVICE(u);
 
         assert(s);
 
@@ -79,72 +98,49 @@ static int service_init(Name *n) {
 
         exec_context_init(&s->exec_context);
 
-        s->timer_id = -1;
+        s->timer_watch.type = WATCH_INVALID;
 
         s->state = SERVICE_DEAD;
 
-        /* Load a .service file */
-        r = name_load_fragment(n);
-
-        /* Load a classic init script as a fallback */
-        if (r == -ENOENT)
-                r = service_load_sysv(s);
+        RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5);
 
-        if (r < 0) {
-                service_done(n);
+        /* Load a .service file */
+        if ((r = unit_load_fragment(u)) < 0) {
+                service_done(u);
                 return r;
         }
 
+        /* Load a classic init script as a fallback, if we couldn*t find anything */
+        if (r == 0)
+                if ((r = service_load_sysv(s)) <= 0) {
+                        service_done(u);
+                        return r < 0 ? r : -ENOENT;
+                }
+
         /* Load dropin directory data */
-        if ((r = name_load_dropin(n)) < 0) {
-                service_done(n);
+        if ((r = unit_load_dropin(u)) < 0) {
+                service_done(u);
                 return r;
         }
 
         return 0;
 }
 
-static void service_dump(Name *n, FILE *f, const char *prefix) {
-
-        static const char* const state_table[_SERVICE_STATE_MAX] = {
-                [SERVICE_DEAD] = "dead",
-                [SERVICE_START_PRE] = "start-pre",
-                [SERVICE_START] = "start",
-                [SERVICE_START_POST] = "post",
-                [SERVICE_RUNNING] = "running",
-                [SERVICE_RELOAD] = "reload",
-                [SERVICE_STOP] = "stop",
-                [SERVICE_STOP_SIGTERM] = "stop-sigterm",
-                [SERVICE_STOP_SIGKILL] = "stop-sigkill",
-                [SERVICE_STOP_POST] = "stop-post",
-                [SERVICE_FINAL_SIGTERM] = "final-sigterm",
-                [SERVICE_FINAL_SIGKILL] = "final-sigkill",
-                [SERVICE_MAINTAINANCE] = "maintainance",
-                [SERVICE_AUTO_RESTART] = "auto-restart",
-        };
-
-        static const char* const command_table[_SERVICE_EXEC_MAX] = {
-                [SERVICE_EXEC_START_PRE] = "ExecStartPre",
-                [SERVICE_EXEC_START] = "ExecStart",
-                [SERVICE_EXEC_START_POST] = "ExecStartPost",
-                [SERVICE_EXEC_RELOAD] = "ExecReload",
-                [SERVICE_EXEC_STOP] = "ExecStop",
-                [SERVICE_EXEC_STOP_POST] = "ExecStopPost",
-        };
+static void service_dump(Unit *u, FILE *f, const char *prefix) {
 
         ServiceExecCommand c;
-        Service *s = SERVICE(n);
-        char *prefix2;
+        Service *s = SERVICE(u);
+        const char *prefix2;
+        char *p2;
 
         assert(s);
 
-        prefix2 = strappend(prefix, "\t");
-        if (!prefix2)
-                prefix2 = "";
+        p2 = strappend(prefix, "\t");
+        prefix2 = p2 ? p2 : prefix;
 
         fprintf(f,
                 "%sService State: %s\n",
-                prefix, state_table[s->state]);
+                prefix, service_state_to_string(s->state));
 
         if (s->pid_file)
                 fprintf(f,
@@ -160,12 +156,12 @@ static void service_dump(Name *n, FILE *f, const char *prefix) {
                         continue;
 
                 fprintf(f, "%sā†’ %s:\n",
-                        prefix, command_table[c]);
+                        prefix, service_exec_command_to_string(c));
 
                 exec_command_dump_list(s->exec_command[c], f, prefix2);
         }
 
-        free(prefix2);
+        free(p2);
 }
 
 static int service_load_pid_file(Service *s) {
@@ -198,6 +194,73 @@ static int service_load_pid_file(Service *s) {
         return 0;
 }
 
+static int service_get_sockets(Service *s, Set **_set) {
+        Set *set;
+        Iterator i;
+        char *t;
+        int r;
+
+        assert(s);
+        assert(_set);
+
+        /* Collects all Socket objects that belong to this
+         * service. Note that a service might have multiple sockets
+         * via multiple names. */
+
+        if (!(set = set_new(NULL, NULL)))
+                return -ENOMEM;
+
+        SET_FOREACH(t, UNIT(s)->meta.names, i) {
+                char *k;
+                Unit *p;
+
+                /* Look for all socket objects that go by any of our
+                 * units and collect their fds */
+
+                if (!(k = unit_name_change_suffix(t, ".socket"))) {
+                        r = -ENOMEM;
+                        goto fail;
+                }
+
+                p = manager_get_unit(UNIT(s)->meta.manager, k);
+                free(k);
+
+                if (!p) continue;
+
+                if ((r = set_put(set, p)) < 0)
+                        goto fail;
+        }
+
+        *_set = set;
+        return 0;
+
+fail:
+        set_free(set);
+        return r;
+}
+
+
+static int service_notify_sockets(Service *s) {
+        Iterator i;
+        Set *set;
+        Socket *sock;
+        int r;
+
+        assert(s);
+
+        /* Notifies all our sockets when we die */
+
+        if ((r = service_get_sockets(s, &set)) < 0)
+                return r;
+
+        SET_FOREACH(sock, set, i)
+                socket_notify_service_dead(sock);
+
+        set_free(set);
+
+        return 0;
+}
+
 static void service_set_state(Service *s, ServiceState state) {
         ServiceState old_state;
         assert(s);
@@ -216,16 +279,17 @@ static void service_set_state(Service *s, ServiceState state) {
             state != SERVICE_FINAL_SIGTERM &&
             state != SERVICE_FINAL_SIGKILL &&
             state != SERVICE_AUTO_RESTART)
-                name_unwatch_timer(NAME(s), &s->timer_id);
+                unit_unwatch_timer(UNIT(s), &s->timer_watch);
 
-        if (state != SERVICE_START_POST &&
+        if (state != SERVICE_START &&
+            state != SERVICE_START_POST &&
             state != SERVICE_RUNNING &&
             state != SERVICE_RELOAD &&
             state != SERVICE_STOP &&
             state != SERVICE_STOP_SIGTERM &&
             state != SERVICE_STOP_SIGKILL)
-                if (s->main_pid >= 0) {
-                        name_unwatch_pid(NAME(s), s->main_pid);
+                if (s->main_pid > 0) {
+                        unit_unwatch_pid(UNIT(s), s->main_pid);
                         s->main_pid = 0;
                 }
 
@@ -239,8 +303,8 @@ static void service_set_state(Service *s, ServiceState state) {
             state != SERVICE_STOP_POST &&
             state != SERVICE_FINAL_SIGTERM &&
             state != SERVICE_FINAL_SIGKILL)
-                if (s->control_pid >= 0) {
-                        name_unwatch_pid(NAME(s), s->control_pid);
+                if (s->control_pid > 0) {
+                        unit_unwatch_pid(UNIT(s), s->control_pid);
                         s->control_pid = 0;
                 }
 
@@ -252,7 +316,20 @@ static void service_set_state(Service *s, ServiceState state) {
             state != SERVICE_STOP_POST)
                 s->control_command = NULL;
 
-        name_notify(NAME(s), state_table[old_state], state_table[s->state]);
+        if (state == SERVICE_DEAD ||
+            state == SERVICE_STOP ||
+            state == SERVICE_STOP_SIGTERM ||
+            state == SERVICE_STOP_SIGKILL ||
+            state == SERVICE_STOP_POST ||
+            state == SERVICE_FINAL_SIGTERM ||
+            state == SERVICE_FINAL_SIGKILL ||
+            state == SERVICE_MAINTAINANCE ||
+            state == SERVICE_AUTO_RESTART)
+                service_notify_sockets(s);
+
+        log_debug("%s changed %s ā†’ %s", unit_id(UNIT(s)), service_state_to_string(old_state), service_state_to_string(state));
+
+        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]);
 }
 
 static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
@@ -260,30 +337,21 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
         int r;
         int *rfds = NULL;
         unsigned rn_fds = 0;
-        char *t;
+        Set *set;
+        Socket *sock;
 
         assert(s);
         assert(fds);
         assert(n_fds);
 
-        SET_FOREACH(t, NAME(s)->meta.names, i) {
-                char *k;
-                Name *p;
+        if ((r = service_get_sockets(s, &set)) < 0)
+                return r;
+
+        SET_FOREACH(sock, set, i) {
                 int *cfds;
                 unsigned cn_fds;
 
-                /* Look for all socket objects that go by any of our
-                 * names and collect their fds */
-
-                if (!(k = name_change_suffix(t, ".socket"))) {
-                        r = -ENOMEM;
-                        goto fail;
-                }
-
-                p = manager_get_name(NAME(s)->meta.manager, k);
-                free(k);
-
-                if ((r = socket_collect_fds(SOCKET(p), &cfds, &cn_fds)) < 0)
+                if ((r = socket_collect_fds(sock, &cfds, &cn_fds)) < 0)
                         goto fail;
 
                 if (!cfds)
@@ -313,10 +381,15 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
 
         *fds = rfds;
         *n_fds = rn_fds;
+
+        set_free(set);
+
         return 0;
 
 fail:
+        set_free(set);
         free(rfds);
+
         return r;
 }
 
@@ -335,15 +408,15 @@ static int service_spawn(Service *s, ExecCommand *c, bool timeout, bool pass_fds
                         goto fail;
 
         if (timeout) {
-                if ((r = name_watch_timer(NAME(s), s->timeout_usec, &s->timer_id)) < 0)
+                if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
                         goto fail;
         } else
-                name_unwatch_timer(NAME(s), &s->timer_id);
+                unit_unwatch_timer(UNIT(s), &s->timer_watch);
 
         if ((r = exec_spawn(c, &s->exec_context, fds, n_fds, &pid)) < 0)
                 goto fail;
 
-        if ((r = name_watch_pid(NAME(s), pid)) < 0)
+        if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
                 /* FIXME: we need to do something here */
                 goto fail;
 
@@ -356,7 +429,7 @@ fail:
         free(fds);
 
         if (timeout)
-                name_unwatch_timer(NAME(s), &s->timer_id);
+                unit_unwatch_timer(UNIT(s), &s->timer_watch);
 
         return r;
 }
@@ -372,7 +445,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) {
             (s->restart == SERVICE_RESTART_ALWAYS ||
              (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure))) {
 
-                if ((r = name_watch_timer(NAME(s), s->restart_usec, &s->timer_id)) < 0)
+                if ((r = unit_watch_timer(UNIT(s), s->restart_usec, &s->timer_watch)) < 0)
                         goto fail;
 
                 service_set_state(s, SERVICE_AUTO_RESTART);
@@ -382,7 +455,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) {
         return;
 
 fail:
-        log_warning("%s failed to run install restart timer: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run install restart timer: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_dead(s, false, false);
 }
 
@@ -395,19 +468,20 @@ static void service_enter_stop_post(Service *s, bool success) {
         if (!success)
                 s->failure = true;
 
-        if ((s->control_command = s->exec_command[SERVICE_EXEC_STOP_POST])) {
-
+        if ((s->control_command = s->exec_command[SERVICE_EXEC_STOP_POST]))
                 if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
                         goto fail;
 
-                service_set_state(s, SERVICE_STOP_POST);
-        } else
+
+        service_set_state(s, SERVICE_STOP_POST);
+
+        if (!s->control_command)
                 service_enter_dead(s, true, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run stop executable: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run stop executable: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 
@@ -442,15 +516,17 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) {
 
                 if (r < 0)
                         goto fail;
+        }
 
-                service_set_state(s, state);
-        } else
+        service_set_state(s, state);
+
+        if (s->main_pid <= 0 && s->control_pid <= 0)
                 service_enter_dead(s, true, true);
 
         return;
 
 fail:
-        log_warning("%s failed to kill processes: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to kill processes: %s", unit_id(UNIT(s)), strerror(-r));
 
         if (sent)  {
                 s->failure = true;
@@ -468,19 +544,19 @@ static void service_enter_stop(Service *s, bool success) {
         if (!success)
                 s->failure = true;
 
-        if ((s->control_command = s->exec_command[SERVICE_EXEC_STOP])) {
-
+        if ((s->control_command = s->exec_command[SERVICE_EXEC_STOP]))
                 if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
                         goto fail;
 
-                service_set_state(s, SERVICE_STOP);
-        } else
+        service_set_state(s, SERVICE_STOP);
+
+        if (!s->control_command)
                 service_enter_signal(s, SERVICE_STOP_SIGTERM, true);
 
         return;
 
 fail:
-        log_warning("%s failed to run stop executable: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run stop executable: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
 }
 
@@ -488,19 +564,20 @@ static void service_enter_start_post(Service *s) {
         int r;
         assert(s);
 
-        if ((s->control_command = s->exec_command[SERVICE_EXEC_START_POST])) {
-
+        if ((s->control_command = s->exec_command[SERVICE_EXEC_START_POST]))
                 if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
                         goto fail;
 
-                service_set_state(s, SERVICE_START_POST);
-        } else
+
+        service_set_state(s, SERVICE_START_POST);
+
+        if (!s->control_command)
                 service_set_state(s, SERVICE_RUNNING);
 
         return;
 
 fail:
-        log_warning("%s failed to run start-post executable: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run start-post executable: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_stop(s, false);
 }
 
@@ -516,6 +593,8 @@ static void service_enter_start(Service *s) {
         if ((r = service_spawn(s, s->exec_command[SERVICE_EXEC_START], s->type == SERVICE_FORKING, true, &pid)) < 0)
                 goto fail;
 
+        service_set_state(s, SERVICE_START);
+
         if (s->type == SERVICE_SIMPLE) {
                 /* For simple services we immediately start
                  * the START_POST binaries. */
@@ -531,14 +610,20 @@ static void service_enter_start(Service *s) {
 
                 s->control_pid = pid;
                 s->control_command = s->exec_command[SERVICE_EXEC_START];
-                service_set_state(s, SERVICE_START);
+        } else if (s->type == SERVICE_FINISH) {
+
+                /* For finishing services we wait until the start
+                 * process exited, too, but it is our main process. */
+
+                s->main_pid = pid;
+                s->control_command = s->exec_command[SERVICE_EXEC_START];
         } else
                 assert_not_reached("Unknown service type");
 
         return;
 
 fail:
-        log_warning("%s failed to run start exectuable: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run start exectuable: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_stop(s, false);
 }
 
@@ -547,19 +632,19 @@ static void service_enter_start_pre(Service *s) {
 
         assert(s);
 
-        if ((s->control_command = s->exec_command[SERVICE_EXEC_START_PRE])) {
-
+        if ((s->control_command = s->exec_command[SERVICE_EXEC_START_PRE]))
                 if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
                         goto fail;
 
-                service_set_state(s, SERVICE_START_PRE);
-        } else
+        service_set_state(s, SERVICE_START_PRE);
+
+        if (!s->control_command)
                 service_enter_start(s);
 
         return;
 
 fail:
-        log_warning("%s failed to run start-pre executable: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run start-pre executable: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_dead(s, false, true);
 }
 
@@ -567,16 +652,16 @@ static void service_enter_restart(Service *s) {
         int r;
         assert(s);
 
-        if ((r = manager_add_job(NAME(s)->meta.manager, JOB_START, NAME(s), JOB_FAIL, false, NULL)) < 0)
+        if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0)
                 goto fail;
 
-        log_debug("%s scheduled restart job.", name_id(NAME(s)));
+        log_debug("%s scheduled restart job.", unit_id(UNIT(s)));
         service_enter_dead(s, true, false);
         return;
 
 fail:
 
-        log_warning("%s failed to schedule restart job: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to schedule restart job: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_dead(s, false, false);
 }
 
@@ -585,19 +670,19 @@ static void service_enter_reload(Service *s) {
 
         assert(s);
 
-        if ((s->control_command = s->exec_command[SERVICE_EXEC_RELOAD])) {
-
+        if ((s->control_command = s->exec_command[SERVICE_EXEC_RELOAD]))
                 if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
                         goto fail;
 
-                service_set_state(s, SERVICE_RELOAD);
-        } else
+        service_set_state(s, SERVICE_RELOAD);
+
+        if (!s->control_command)
                 service_set_state(s, SERVICE_RUNNING);
 
         return;
 
 fail:
-        log_warning("%s failed to run reload executable: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run reload executable: %s", unit_id(UNIT(s)), strerror(-r));
         service_enter_stop(s, false);
 }
 
@@ -619,7 +704,7 @@ static void service_run_next(Service *s, bool success) {
         return;
 
 fail:
-        log_warning("%s failed to run spawn next executable: %s", name_id(NAME(s)), strerror(-r));
+        log_warning("%s failed to run spawn next executable: %s", unit_id(UNIT(s)), strerror(-r));
 
         if (s->state == SERVICE_STOP)
                 service_enter_stop_post(s, false);
@@ -629,8 +714,8 @@ fail:
                 service_enter_stop(s, false);
 }
 
-static int service_start(Name *n) {
-        Service *s = SERVICE(n);
+static int service_start(Unit *u) {
+        Service *s = SERVICE(u);
 
         assert(s);
 
@@ -652,6 +737,12 @@ static int service_start(Name *n) {
 
         assert(s->state == SERVICE_DEAD || s->state == SERVICE_MAINTAINANCE || s->state == SERVICE_AUTO_RESTART);
 
+        /* Make sure we don't enter a busy loop of some kind. */
+        if (!ratelimit_test(&s->ratelimit)) {
+                log_warning("%s start request repeated too quickly, refusing to start.", unit_id(u));
+                return -EAGAIN;
+        }
+
         s->failure = false;
         s->main_pid_known = false;
 
@@ -659,8 +750,8 @@ static int service_start(Name *n) {
         return 0;
 }
 
-static int service_stop(Name *n) {
-        Service *s = SERVICE(n);
+static int service_stop(Unit *u) {
+        Service *s = SERVICE(u);
 
         assert(s);
 
@@ -681,8 +772,8 @@ static int service_stop(Name *n) {
         return 0;
 }
 
-static int service_reload(Name *n) {
-        Service *s = SERVICE(n);
+static int service_reload(Unit *u) {
+        Service *s = SERVICE(u);
 
         assert(s);
 
@@ -692,18 +783,18 @@ static int service_reload(Name *n) {
         return 0;
 }
 
-static bool service_can_reload(Name *n) {
-        Service *s = SERVICE(n);
+static bool service_can_reload(Unit *u) {
+        Service *s = SERVICE(u);
 
         assert(s);
 
         return !!s->exec_command[SERVICE_EXEC_RELOAD];
 }
 
-static NameActiveState service_active_state(Name *n) {
-        assert(n);
+static UnitActiveState service_active_state(Unit *u) {
+        assert(u);
 
-        return state_table[SERVICE(n)->state];
+        return state_translation_table[SERVICE(u)->state];
 }
 
 static int main_pid_good(Service *s) {
@@ -727,14 +818,14 @@ static bool control_pid_good(Service *s) {
         return s->control_pid > 0;
 }
 
-static void service_sigchld_event(Name *n, pid_t pid, int code, int status) {
-        Service *s = SERVICE(n);
+static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
+        Service *s = SERVICE(u);
         bool success;
 
         assert(s);
         assert(pid >= 0);
 
-        success = code == CLD_EXITED || status == 0;
+        success = code == CLD_EXITED && status == 0;
         s->failure = s->failure || !success;
 
         if (s->main_pid == pid) {
@@ -742,12 +833,12 @@ static void service_sigchld_event(Name *n, pid_t pid, int code, int status) {
                 exec_status_fill(&s->main_exec_status, pid, code, status);
                 s->main_pid = 0;
 
-                if (s->type == SERVICE_SIMPLE) {
+                if (s->type == SERVICE_SIMPLE || s->type == SERVICE_FINISH) {
                         assert(s->exec_command[SERVICE_EXEC_START]);
                         s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status;
                 }
 
-                log_debug("%s: main process exited, code=%s status=%i", name_id(n), sigchld_code(code), status);
+                log_debug("%s: main process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
 
                 /* The service exited, so the service is officially
                  * gone. */
@@ -761,6 +852,16 @@ static void service_sigchld_event(Name *n, pid_t pid, int code, int status) {
                          * done */
                         break;
 
+                case SERVICE_START:
+                        assert(s->type == SERVICE_FINISH);
+
+                        /* This was our main goal, so let's go on */
+                        if (success)
+                                service_enter_start_post(s);
+                        else
+                                service_enter_stop(s, false);
+                        break;
+
                 case SERVICE_RUNNING:
                         service_enter_stop(s, success);
                         break;
@@ -784,7 +885,7 @@ static void service_sigchld_event(Name *n, pid_t pid, int code, int status) {
                 exec_status_fill(&s->control_command->exec_status, pid, code, status);
                 s->control_pid = 0;
 
-                log_debug("%s: control process exited, code=%s status=%i", name_id(n), sigchld_code(code), status);
+                log_debug("%s: control process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
 
                 /* If we are shutting things down anyway we
                  * don't care about failing commands. */
@@ -801,6 +902,8 @@ static void service_sigchld_event(Name *n, pid_t pid, int code, int status) {
                         /* No further commands for this step, so let's
                          * figure out what to do next */
 
+                        log_debug("%s got final SIGCHLD for state %s", unit_id(u), service_state_to_string(s->state));
+
                         switch (s->state) {
 
                         case SERVICE_START_PRE:
@@ -840,7 +943,7 @@ static void service_sigchld_event(Name *n, pid_t pid, int code, int status) {
                                          * executed. */
 
                                         if ((r = service_load_pid_file(s)) < 0)
-                                                log_warning("%s: failed to load PID file %s: %s", name_id(NAME(s)), s->pid_file, strerror(-r));
+                                                log_warning("%s: failed to load PID file %s: %s", unit_id(UNIT(s)), s->pid_file, strerror(-r));
                                 }
 
                                 /* Fall through */
@@ -888,13 +991,13 @@ static void service_sigchld_event(Name *n, pid_t pid, int code, int status) {
                 assert_not_reached("Got SIGCHLD for unkown PID");
 }
 
-static void service_timer_event(Name *n, int id, uint64_t elapsed) {
-        Service *s = SERVICE(n);
+static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
+        Service *s = SERVICE(u);
 
         assert(s);
         assert(elapsed == 1);
 
-        assert(s->timer_id == id);
+        assert(w == &s->timer_watch);
 
         switch (s->state) {
 
@@ -902,17 +1005,17 @@ static void service_timer_event(Name *n, int id, uint64_t elapsed) {
         case SERVICE_START:
         case SERVICE_START_POST:
         case SERVICE_RELOAD:
-                log_warning("%s operation timed out. Stopping.", name_id(n));
+                log_warning("%s operation timed out. Stopping.", unit_id(u));
                 service_enter_stop(s, false);
                 break;
 
         case SERVICE_STOP:
-                log_warning("%s stopping timed out. Terminating.", name_id(n));
+                log_warning("%s stopping timed out. Terminating.", unit_id(u));
                 service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
                 break;
 
         case SERVICE_STOP_SIGTERM:
-                log_warning("%s stopping timed out. Killing.", name_id(n));
+                log_warning("%s stopping timed out. Killing.", unit_id(u));
                 service_enter_signal(s, SERVICE_STOP_SIGKILL, false);
                 break;
 
@@ -921,27 +1024,27 @@ static void service_timer_event(Name *n, int id, uint64_t elapsed) {
                  * Must be something we cannot kill, so let's just be
                  * weirded out and continue */
 
-                log_warning("%s still around after SIGKILL. Ignoring.", name_id(n));
+                log_warning("%s still around after SIGKILL. Ignoring.", unit_id(u));
                 service_enter_stop_post(s, false);
                 break;
 
         case SERVICE_STOP_POST:
-                log_warning("%s stopping timed out (2). Terminating.", name_id(n));
+                log_warning("%s stopping timed out (2). Terminating.", unit_id(u));
                 service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
                 break;
 
         case SERVICE_FINAL_SIGTERM:
-                log_warning("%s stopping timed out (2). Killing.", name_id(n));
+                log_warning("%s stopping timed out (2). Killing.", unit_id(u));
                 service_enter_signal(s, SERVICE_FINAL_SIGKILL, false);
                 break;
 
         case SERVICE_FINAL_SIGKILL:
-                log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", name_id(n));
+                log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", unit_id(u));
                 service_enter_dead(s, false, true);
                 break;
 
         case SERVICE_AUTO_RESTART:
-                log_debug("%s holdoff time over, scheduling restart.", name_id(n));
+                log_debug("%s holdoff time over, scheduling restart.", unit_id(u));
                 service_enter_restart(s);
                 break;
 
@@ -950,7 +1053,53 @@ static void service_timer_event(Name *n, int id, uint64_t elapsed) {
         }
 }
 
-const NameVTable service_vtable = {
+static const char* const service_state_table[_SERVICE_STATE_MAX] = {
+        [SERVICE_DEAD] = "dead",
+        [SERVICE_START_PRE] = "start-pre",
+        [SERVICE_START] = "start",
+        [SERVICE_START_POST] = "start-post",
+        [SERVICE_RUNNING] = "running",
+        [SERVICE_RELOAD] = "reload",
+        [SERVICE_STOP] = "stop",
+        [SERVICE_STOP_SIGTERM] = "stop-sigterm",
+        [SERVICE_STOP_SIGKILL] = "stop-sigkill",
+        [SERVICE_STOP_POST] = "stop-post",
+        [SERVICE_FINAL_SIGTERM] = "final-sigterm",
+        [SERVICE_FINAL_SIGKILL] = "final-sigkill",
+        [SERVICE_MAINTAINANCE] = "maintainance",
+        [SERVICE_AUTO_RESTART] = "auto-restart",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_state, ServiceState);
+
+static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
+        [SERVICE_ONCE] = "once",
+        [SERVICE_RESTART_ON_SUCCESS] = "restart-on-success",
+        [SERVICE_RESTART_ALWAYS] = "restart-on-failure",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart);
+
+static const char* const service_type_table[_SERVICE_TYPE_MAX] = {
+        [SERVICE_FORKING] = "forking",
+        [SERVICE_SIMPLE] = "simple",
+        [SERVICE_FINISH] = "finish"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_type, ServiceType);
+
+static const char* const service_exec_command_table[_SERVICE_EXEC_MAX] = {
+        [SERVICE_EXEC_START_PRE] = "ExecStartPre",
+        [SERVICE_EXEC_START] = "ExecStart",
+        [SERVICE_EXEC_START_POST] = "ExecStartPost",
+        [SERVICE_EXEC_RELOAD] = "ExecReload",
+        [SERVICE_EXEC_STOP] = "ExecStop",
+        [SERVICE_EXEC_STOP_POST] = "ExecStopPost",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_exec_command, ServiceExecCommand);
+
+const UnitVTable service_vtable = {
         .suffix = ".service",
 
         .init = service_init,