X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.c;h=905eadb9862f0b988f5f295a10c8ac5bc6d5d9f8;hp=a38c88076eeb46ded4fa938eec309141b26b15c2;hb=e55224ca655e6c4ec745a84ae5a051a9e6e5f74f;hpb=18c78fb1af5415bb6f87d9c7cae1f9c60e14ae24 diff --git a/src/service.c b/src/service.c index a38c88076..905eadb98 100644 --- a/src/service.c +++ b/src/service.c @@ -32,6 +32,7 @@ #include "strv.h" #include "unit-name.h" #include "dbus-service.h" +#include "special.h" #define COMMENTS "#;\n" #define NEWLINES "\n\r" @@ -49,13 +50,13 @@ static const struct { const RunlevelType type; } rcnd_table[] = { /* Standard SysV runlevels */ - { "rc0.d", SPECIAL_RUNLEVEL0_TARGET, RUNLEVEL_DOWN }, - { "rc1.d", SPECIAL_RUNLEVEL1_TARGET, RUNLEVEL_UP }, + { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, + { "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP }, { "rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP }, { "rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP }, { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, - { "rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN }, + { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }, /* SUSE style boot.d */ { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, @@ -125,6 +126,27 @@ static void service_unwatch_main_pid(Service *s) { s->main_pid = 0; } +static int service_set_main_pid(Service *s, pid_t pid) { + pid_t ppid; + + assert(s); + + if (pid <= 1) + return -EINVAL; + + if (pid == getpid()) + return -EINVAL; + + if (get_parent_of_pid(pid, &ppid) >= 0 && ppid != getpid()) + log_warning("%s: Supervising process %lu which is not our child. We'll most likely not notice when it exits.", + s->meta.id, (unsigned long) pid); + + s->main_pid = pid; + s->main_pid_known = true; + + return 0; +} + static void service_close_socket_fd(Service *s) { assert(s); @@ -919,8 +941,8 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { static int service_load_pid_file(Service *s) { char *k; - unsigned long p; int r; + pid_t pid; assert(s); @@ -935,29 +957,24 @@ static int service_load_pid_file(Service *s) { if ((r = read_one_line_file(s->pid_file, &k)) < 0) return r; - if ((r = safe_atolu(k, &p)) < 0) { - free(k); - return r; - } - - if ((unsigned long) (pid_t) p != p) - return -ERANGE; + r = parse_pid(k, &pid); + free(k); - if (p <= 1) - return -ERANGE; + if (r < 0) + return r; - if (kill((pid_t) p, 0) < 0 && errno != EPERM) { - log_warning("PID %llu read from file %s does not exist. Your service or init script might be broken.", - (unsigned long long) p, s->pid_file); + if (kill(pid, 0) < 0 && errno != EPERM) { + log_warning("PID %lu read from file %s does not exist. Your service or init script might be broken.", + (unsigned long) pid, s->pid_file); return -ESRCH; } - if ((r = unit_watch_pid(UNIT(s), (pid_t) p)) < 0) - /* FIXME: we need to do something here */ + if ((r = service_set_main_pid(s, pid)) < 0) return r; - s->main_pid = (pid_t) p; - s->main_pid_known = true; + if ((r = unit_watch_pid(UNIT(s), pid)) < 0) + /* FIXME: we need to do something here */ + return r; return 0; } @@ -1460,6 +1477,7 @@ fail: static void service_enter_stop(Service *s, bool success) { int r; + assert(s); if (!success) @@ -1522,7 +1540,6 @@ static void service_enter_start_post(Service *s) { &s->control_pid)) < 0) goto fail; - service_set_state(s, SERVICE_START_POST); } else service_enter_running(s, true); @@ -1561,9 +1578,7 @@ static void service_enter_start(Service *s) { /* For simple services we immediately start * the START_POST binaries. */ - s->main_pid = pid; - s->main_pid_known = true; - + service_set_main_pid(s, pid); service_enter_start_post(s); } else if (s->type == SERVICE_FORKING) { @@ -1571,10 +1586,10 @@ static void service_enter_start(Service *s) { /* For forking services we wait until the start * process exited. */ - s->control_pid = pid; - s->control_command_id = SERVICE_EXEC_START; s->control_command = s->exec_command[SERVICE_EXEC_START]; + + s->control_pid = pid; service_set_state(s, SERVICE_START); } else if (s->type == SERVICE_FINISH || @@ -1588,9 +1603,7 @@ static void service_enter_start(Service *s) { * but wait for the bus name to appear on the * bus. Notify services are similar. */ - s->main_pid = pid; - s->main_pid_known = true; - + service_set_main_pid(s, pid); service_set_state(s, SERVICE_START); } else assert_not_reached("Unknown service type"); @@ -1819,10 +1832,10 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) { unit_serialize_item(u, f, "failure", yes_no(s->failure)); if (s->control_pid > 0) - unit_serialize_item_format(u, f, "control-pid", "%u", (unsigned) (s->control_pid)); + unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) s->control_pid); - if (s->main_pid > 0) - unit_serialize_item_format(u, f, "main-pid", "%u", (unsigned) (s->main_pid)); + if (s->main_pid_known && s->main_pid > 0) + unit_serialize_item_format(u, f, "main-pid", "%lu", (unsigned long) s->main_pid); unit_serialize_item(u, f, "main-pid-known", yes_no(s->main_pid_known)); @@ -1868,19 +1881,19 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, else s->failure = b || s->failure; } else if (streq(key, "control-pid")) { - unsigned pid; + pid_t pid; - if ((r = safe_atou(value, &pid)) < 0 || pid <= 0) + if ((r = parse_pid(value, &pid)) < 0) log_debug("Failed to parse control-pid value %s", value); else - s->control_pid = (pid_t) pid; + s->control_pid = pid; } else if (streq(key, "main-pid")) { - unsigned pid; + pid_t pid; - if ((r = safe_atou(value, &pid)) < 0 || pid <= 0) + if ((r = parse_pid(value, &pid)) < 0) log_debug("Failed to parse main-pid value %s", value); else - s->main_pid = (pid_t) pid; + service_set_main_pid(s, (pid_t) pid); } else if (streq(key, "main-pid-known")) { int b; @@ -2219,15 +2232,13 @@ static void service_notify_message(Unit *u, char **tags) { s->state == SERVICE_START_POST || s->state == SERVICE_RUNNING || s->state == SERVICE_RELOAD)) { - unsigned long pid; + pid_t pid; - if (safe_atolu(e + 8, &pid) < 0 || - (unsigned long) (pid_t) pid != pid || - pid <= 1) + if (parse_pid(e + 8, &pid) < 0) log_warning("Failed to parse %s", e); else { log_debug("%s: got %s", u->meta.id, e); - s->main_pid = (pid_t) pid; + service_set_main_pid(s, pid); } } @@ -2460,7 +2471,7 @@ static void service_bus_query_pid_done( s->state == SERVICE_START_POST || s->state == SERVICE_RUNNING || s->state == SERVICE_RELOAD)) - s->main_pid = pid; + service_set_main_pid(s, pid); } int service_set_socket_fd(Service *s, int fd) {