#include "load-dropin.h"
#include "log.h"
-static const UnitActiveState state_table[_SERVICE_STATE_MAX] = {
+static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
[SERVICE_DEAD] = UNIT_INACTIVE,
[SERVICE_START_PRE] = UNIT_ACTIVATING,
[SERVICE_START] = UNIT_ACTIVATING,
[SERVICE_AUTO_RESTART] = UNIT_ACTIVATING,
};
+static const char* const state_string_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",
+};
+
static void service_done(Unit *u) {
Service *s = SERVICE(u);
s->control_pid = 0;
}
- unit_unwatch_timer(u, &s->timer_id);
+ unit_unwatch_timer(u, &s->timer_watch);
}
static int service_load_sysv(Service *s) {
exec_context_init(&s->exec_context);
- s->timer_id = -1;
+ s->timer_watch.type = WATCH_INVALID;
s->state = SERVICE_DEAD;
static void service_dump(Unit *u, 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",
fprintf(f,
"%sService State: %s\n",
- prefix, state_table[s->state]);
+ prefix, state_string_table[s->state]);
if (s->pid_file)
fprintf(f,
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 *socket;
+ int r;
+
+ assert(s);
+
+ /* Notifies all our sockets when we die */
+
+ if ((r = service_get_sockets(s, &set)) < 0)
+ return r;
+
+ SET_FOREACH(socket, set, i)
+ socket_notify_service_dead(socket);
+
+ set_free(set);
+
+ return 0;
+}
+
static void service_set_state(Service *s, ServiceState state) {
ServiceState old_state;
assert(s);
state != SERVICE_FINAL_SIGTERM &&
state != SERVICE_FINAL_SIGKILL &&
state != SERVICE_AUTO_RESTART)
- unit_unwatch_timer(UNIT(s), &s->timer_id);
+ unit_unwatch_timer(UNIT(s), &s->timer_watch);
if (state != SERVICE_START_POST &&
state != SERVICE_RUNNING &&
state != SERVICE_STOP &&
state != SERVICE_STOP_SIGTERM &&
state != SERVICE_STOP_SIGKILL)
- if (s->main_pid >= 0) {
+ if (s->main_pid > 0) {
unit_unwatch_pid(UNIT(s), s->main_pid);
s->main_pid = 0;
}
state != SERVICE_STOP_POST &&
state != SERVICE_FINAL_SIGTERM &&
state != SERVICE_FINAL_SIGKILL)
- if (s->control_pid >= 0) {
+ if (s->control_pid > 0) {
unit_unwatch_pid(UNIT(s), s->control_pid);
s->control_pid = 0;
}
state != SERVICE_STOP_POST)
s->control_command = NULL;
- unit_notify(UNIT(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)), state_string_table[old_state], state_string_table[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) {
int r;
int *rfds = NULL;
unsigned rn_fds = 0;
- char *t;
+ Set *set;
+ Socket *socket;
assert(s);
assert(fds);
assert(n_fds);
- SET_FOREACH(t, UNIT(s)->meta.names, i) {
- char *k;
- Unit *p;
+ if ((r = service_get_sockets(s, &set)) < 0)
+ return r;
+
+ SET_FOREACH(socket, set, i) {
int *cfds;
unsigned cn_fds;
- /* 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 ((r = socket_collect_fds(SOCKET(p), &cfds, &cn_fds)) < 0)
+ if ((r = socket_collect_fds(socket, &cfds, &cn_fds)) < 0)
goto fail;
if (!cfds)
*fds = rfds;
*n_fds = rn_fds;
+
+ set_free(set);
+
return 0;
fail:
+ set_free(set);
free(rfds);
+
return r;
}
goto fail;
if (timeout) {
- if ((r = unit_watch_timer(UNIT(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
- unit_unwatch_timer(UNIT(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;
free(fds);
if (timeout)
- unit_unwatch_timer(UNIT(s), &s->timer_id);
+ unit_unwatch_timer(UNIT(s), &s->timer_watch);
return r;
}
(s->restart == SERVICE_RESTART_ALWAYS ||
(s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure))) {
- if ((r = unit_watch_timer(UNIT(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);
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;
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;
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;
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;
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. */
s->control_pid = pid;
s->control_command = s->exec_command[SERVICE_EXEC_START];
- service_set_state(s, SERVICE_START);
} else
assert_not_reached("Unknown service type");
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;
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;
static UnitActiveState service_active_state(Unit *u) {
assert(u);
- return state_table[SERVICE(u)->state];
+ return state_translation_table[SERVICE(u)->state];
}
static int main_pid_good(Service *s) {
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) {
/* 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), state_string_table[s->state]);
+
switch (s->state) {
case SERVICE_START_PRE:
assert_not_reached("Got SIGCHLD for unkown PID");
}
-static void service_timer_event(Unit *u, int id, uint64_t elapsed) {
+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) {
~ianmdlvl / elogind.git / blobdiff