X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.c;h=4dcdf2e507df4b7b0e54bbc54a3d047e6563f075;hp=2a773c6dbbd98bc3d10dab2ea737094b92bc57bf;hb=84e3543ef4c4758621f8a304b14642072303ef82;hpb=871d7de47c13ee6cd78b8eefdf9128be3c740ac0 diff --git a/src/manager.c b/src/manager.c index 2a773c6db..4dcdf2e50 100644 --- a/src/manager.c +++ b/src/manager.c @@ -52,6 +52,7 @@ #include "dbus-unit.h" #include "dbus-job.h" #include "missing.h" +#include "path-lookup.h" /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */ #define GC_QUEUE_ENTRIES_MAX 16 @@ -122,234 +123,6 @@ static int manager_setup_signals(Manager *m) { return 0; } -static char** session_dirs(void) { - const char *home, *e; - char *config_home = NULL, *data_home = NULL; - char **config_dirs = NULL, **data_dirs = NULL; - char **r = NULL, **t; - - /* Implement the mechanisms defined in - * - * http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html - * - * We look in both the config and the data dirs because we - * want to encourage that distributors ship their unit files - * as data, and allow overriding as configuration. - */ - - home = getenv("HOME"); - - if ((e = getenv("XDG_CONFIG_HOME"))) { - if (asprintf(&config_home, "%s/systemd/session", e) < 0) - goto fail; - - } else if (home) { - if (asprintf(&config_home, "%s/.config/systemd/session", home) < 0) - goto fail; - } - - if ((e = getenv("XDG_CONFIG_DIRS"))) - if (!(config_dirs = strv_split(e, ":"))) - goto fail; - - /* We don't treat /etc/xdg/systemd here as the spec - * suggests because we assume that that is a link to - * /etc/systemd/ anyway. */ - - if ((e = getenv("XDG_DATA_HOME"))) { - if (asprintf(&data_home, "%s/systemd/session", e) < 0) - goto fail; - - } else if (home) { - if (asprintf(&data_home, "%s/.local/share/systemd/session", home) < 0) - goto fail; - - /* There is really no need for two unit dirs in $HOME, - * except to be fully compliant with the XDG spec. We - * now try to link the two dirs, so that we can - * minimize disk seeks a little. Further down we'll - * then filter out this link, if it is actually is - * one. */ - - mkdir_parents(data_home, 0777); - symlink("../../../.config/systemd/session", data_home); - } - - if ((e = getenv("XDG_DATA_DIRS"))) - data_dirs = strv_split(e, ":"); - else - data_dirs = strv_new("/usr/local/share", "/usr/share", NULL); - - if (!data_dirs) - goto fail; - - /* Now merge everything we found. */ - if (config_home) { - if (!(t = strv_append(r, config_home))) - goto fail; - strv_free(r); - r = t; - } - - if (!(t = strv_merge_concat(r, config_dirs, "/systemd/session"))) - goto finish; - strv_free(r); - r = t; - - if (!(t = strv_append(r, SESSION_CONFIG_UNIT_PATH))) - goto fail; - strv_free(r); - r = t; - - if (data_home) { - if (!(t = strv_append(r, data_home))) - goto fail; - strv_free(r); - r = t; - } - - if (!(t = strv_merge_concat(r, data_dirs, "/systemd/session"))) - goto fail; - strv_free(r); - r = t; - - if (!(t = strv_append(r, SESSION_DATA_UNIT_PATH))) - goto fail; - strv_free(r); - r = t; - - if (!strv_path_make_absolute_cwd(r)) - goto fail; - -finish: - free(config_home); - strv_free(config_dirs); - free(data_home); - strv_free(data_dirs); - - return r; - -fail: - strv_free(r); - r = NULL; - goto finish; -} - -static int manager_find_paths(Manager *m) { - const char *e; - char *t; - - assert(m); - - /* First priority is whatever has been passed to us via env - * vars */ - if ((e = getenv("SYSTEMD_UNIT_PATH"))) - if (!(m->unit_path = split_path_and_make_absolute(e))) - return -ENOMEM; - - if (strv_isempty(m->unit_path)) { - - /* Nothing is set, so let's figure something out. */ - strv_free(m->unit_path); - - if (m->running_as == MANAGER_SESSION) { - if (!(m->unit_path = session_dirs())) - return -ENOMEM; - } else - if (!(m->unit_path = strv_new( - SYSTEM_CONFIG_UNIT_PATH, /* /etc/systemd/system/ */ - SYSTEM_DATA_UNIT_PATH, /* /lib/systemd/system/ */ - NULL))) - return -ENOMEM; - } - - if (m->running_as == MANAGER_INIT) { - /* /etc/init.d/ compatibility does not matter to users */ - - if ((e = getenv("SYSTEMD_SYSVINIT_PATH"))) - if (!(m->sysvinit_path = split_path_and_make_absolute(e))) - return -ENOMEM; - - if (strv_isempty(m->sysvinit_path)) { - strv_free(m->sysvinit_path); - - if (!(m->sysvinit_path = strv_new( - SYSTEM_SYSVINIT_PATH, /* /etc/init.d/ */ - NULL))) - return -ENOMEM; - } - - if ((e = getenv("SYSTEMD_SYSVRCND_PATH"))) - if (!(m->sysvrcnd_path = split_path_and_make_absolute(e))) - return -ENOMEM; - - if (strv_isempty(m->sysvrcnd_path)) { - strv_free(m->sysvrcnd_path); - - if (!(m->sysvrcnd_path = strv_new( - SYSTEM_SYSVRCND_PATH, /* /etc/rcN.d/ */ - NULL))) - return -ENOMEM; - } - } - - if (m->unit_path) - if (!strv_path_canonicalize(m->unit_path)) - return -ENOMEM; - - if (m->sysvinit_path) - if (!strv_path_canonicalize(m->sysvinit_path)) - return -ENOMEM; - - if (m->sysvrcnd_path) - if (!strv_path_canonicalize(m->sysvrcnd_path)) - return -ENOMEM; - - strv_uniq(m->unit_path); - strv_uniq(m->sysvinit_path); - strv_uniq(m->sysvrcnd_path); - - if (!strv_isempty(m->unit_path)) { - - if (!(t = strv_join(m->unit_path, "\n\t"))) - return -ENOMEM; - log_debug("Looking for unit files in:\n\t%s", t); - free(t); - } else { - log_debug("Ignoring unit files."); - strv_free(m->unit_path); - m->unit_path = NULL; - } - - if (!strv_isempty(m->sysvinit_path)) { - - if (!(t = strv_join(m->sysvinit_path, "\n\t"))) - return -ENOMEM; - - log_debug("Looking for SysV init scripts in:\n\t%s", t); - free(t); - } else { - log_debug("Ignoring SysV init scripts."); - strv_free(m->sysvinit_path); - m->sysvinit_path = NULL; - } - - if (!strv_isempty(m->sysvrcnd_path)) { - - if (!(t = strv_join(m->sysvrcnd_path, "\n\t"))) - return -ENOMEM; - - log_debug("Looking for SysV rcN.d links in:\n\t%s", t); - free(t); - } else { - log_debug("Ignoring SysV rcN.d links."); - strv_free(m->sysvrcnd_path); - m->sysvrcnd_path = NULL; - } - - return 0; -} - int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { Manager *m; int r = -ENOMEM; @@ -395,7 +168,7 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) goto fail; - if ((r = manager_find_paths(m)) < 0) + if ((r = lookup_paths_init(&m->lookup_paths, m->running_as)) < 0) goto fail; if ((r = manager_setup_signals(m)) < 0) @@ -548,6 +321,19 @@ static void manager_clear_jobs_and_units(Manager *m) { while ((u = hashmap_first(m->units))) unit_free(u); + + manager_dispatch_cleanup_queue(m); + + assert(!m->load_queue); + assert(!m->run_queue); + assert(!m->dbus_unit_queue); + assert(!m->dbus_job_queue); + assert(!m->cleanup_queue); + assert(!m->gc_queue); + + assert(hashmap_isempty(m->transaction_jobs)); + assert(hashmap_isempty(m->jobs)); + assert(hashmap_isempty(m->units)); } void manager_free(Manager *m) { @@ -555,7 +341,6 @@ void manager_free(Manager *m) { assert(m); - manager_dispatch_cleanup_queue(m); manager_clear_jobs_and_units(m); for (c = 0; c < _UNIT_TYPE_MAX; c++) @@ -580,9 +365,7 @@ void manager_free(Manager *m) { if (m->signal_watch.fd >= 0) close_nointr_nofail(m->signal_watch.fd); - strv_free(m->unit_path); - strv_free(m->sysvinit_path); - strv_free(m->sysvrcnd_path); + lookup_paths_free(&m->lookup_paths); strv_free(m->environment); free(m->cgroup_controller); @@ -625,9 +408,8 @@ int manager_coldplug(Manager *m) { if (u->meta.id != k) continue; - if (UNIT_VTABLE(u)->coldplug) - if ((q = UNIT_VTABLE(u)->coldplug(u)) < 0) - r = q; + if ((q = unit_coldplug(u)) < 0) + r = q; } return r; @@ -964,20 +746,25 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned /* Does a recursive sweep through the ordering graph, looking * for a cycle. If we find cycle we try to break it. */ - /* Did we find a cycle? */ - if (j->marker && j->generation == generation) { + /* Have we seen this before? */ + if (j->generation == generation) { Job *k; - /* So, we already have been here. We have a - * cycle. Let's try to break it. We go backwards in - * our path and try to find a suitable job to - * remove. We use the marker to find our way back, - * since smart how we are we stored our way back in - * there. */ + /* If the marker is NULL we have been here already and + * decided the job was loop-free from here. Hence + * shortcut things and return right-away. */ + if (!j->marker) + return 0; + /* So, the marker is not NULL and we already have been + * here. We have a cycle. Let's try to break it. We go + * backwards in our path and try to find a suitable + * job to remove. We use the marker to find our way + * back, since smart how we are we stored our way back + * in there. */ log_debug("Found ordering cycle on %s/%s", j->unit->meta.id, job_type_to_string(j->type)); - for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) { + for (k = from; k; k = ((k->generation == generation && k->marker != k) ? k->marker : NULL)) { log_debug("Walked on cycle path to %s/%s", k->unit->meta.id, job_type_to_string(k->type)); @@ -1002,8 +789,10 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned } /* Make the marker point to where we come from, so that we can - * find our way backwards if we want to break a cycle */ - j->marker = from; + * find our way backwards if we want to break a cycle. We use + * a special marker for the beginning: we point to + * ourselves. */ + j->marker = from ? from : j; j->generation = generation; /* We assume that the the dependencies are bidirectional, and @@ -1035,6 +824,7 @@ static int transaction_verify_order(Manager *m, unsigned *generation) { Job *j; int r; Iterator i; + unsigned g; assert(m); assert(generation); @@ -1042,8 +832,10 @@ static int transaction_verify_order(Manager *m, unsigned *generation) { /* Check if the ordering graph is cyclic. If it is, try to fix * that up by dropping one of the jobs. */ + g = (*generation)++; + HASHMAP_FOREACH(j, m->transaction_jobs, i) - if ((r = transaction_verify_order_one(m, j, NULL, (*generation)++)) < 0) + if ((r = transaction_verify_order_one(m, j, NULL, g)) < 0) return r; return 0; @@ -1791,11 +1583,13 @@ static int manager_dispatch_sigchld(Manager *m) { return 0; } -static void manager_start_target(Manager *m, const char *name) { +static int manager_start_target(Manager *m, const char *name) { int r; if ((r = manager_add_job_by_name(m, JOB_START, name, JOB_REPLACE, true, NULL)) < 0) log_error("Failed to enqueue %s job: %s", name, strerror(-r)); + + return r; } static int manager_process_signal_fd(Manager *m) { @@ -1824,14 +1618,14 @@ static int manager_process_signal_fd(Manager *m) { break; case SIGTERM: - if (m->running_as == MANAGER_INIT) + if (m->running_as == MANAGER_INIT) { /* This is for compatibility with the * original sysvinit */ m->exit_code = MANAGER_REEXECUTE; - else - m->exit_code = MANAGER_EXIT; + break; + } - return 0; + /* Fall through */ case SIGINT: if (m->running_as == MANAGER_INIT) { @@ -1839,8 +1633,13 @@ static int manager_process_signal_fd(Manager *m) { break; } - m->exit_code = MANAGER_EXIT; - return 0; + /* Run the exit target if there is one, if not, just exit. */ + if (manager_start_target(m, SPECIAL_EXIT_SERVICE) < 0) { + m->exit_code = MANAGER_EXIT; + return 0; + } + + break; case SIGWINCH: if (m->running_as == MANAGER_INIT) @@ -1875,10 +1674,32 @@ static int manager_process_signal_fd(Manager *m) { break; } - case SIGUSR2: - manager_dump_units(m, stdout, "\t"); - manager_dump_jobs(m, stdout, "\t"); + case SIGUSR2: { + FILE *f; + char *dump = NULL; + size_t size; + + if (!(f = open_memstream(&dump, &size))) { + log_warning("Failed to allocate memory stream."); + break; + } + + manager_dump_units(m, f, "\t"); + manager_dump_jobs(m, f, "\t"); + + if (ferror(f)) { + fclose(f); + free(dump); + log_warning("Failed to write status stream"); + break; + } + + fclose(f); + log_dump(LOG_INFO, dump); + free(dump); + break; + } case SIGHUP: m->exit_code = MANAGER_RELOAD; @@ -2296,6 +2117,11 @@ int manager_reload(Manager *m) { /* From here on there is no way back. */ manager_clear_jobs_and_units(m); + /* Find new unit paths */ + lookup_paths_free(&m->lookup_paths); + if ((q = lookup_paths_init(&m->lookup_paths, m->running_as)) < 0) + r = q; + /* First, enumerate what we can from all config files */ if ((q = manager_enumerate(m)) < 0) r = q;