X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Funit.c;h=3ce87ea1d38ebdecfef6c26b609ef98a36b6aa1a;hp=895e40178abec92cf8d2b179f96302e1c8917595;hb=27d340c772fb1b251085dba7bd5420484f7c5892;hpb=bdbf995180771da2d3a85ea011d49461775c74a3 diff --git a/src/unit.c b/src/unit.c index 895e40178..3ce87ea1d 100644 --- a/src/unit.c +++ b/src/unit.c @@ -42,6 +42,7 @@ #include "special.h" #include "cgroup-util.h" #include "missing.h" +#include "cgroup-attr.h" const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = &service_vtable, @@ -73,6 +74,7 @@ Unit *unit_new(Manager *m) { u->meta.type = _UNIT_TYPE_INVALID; u->meta.deserialized_job = _JOB_TYPE_INVALID; u->meta.default_dependencies = true; + u->meta.unit_file_state = _UNIT_FILE_STATE_INVALID; return u; } @@ -118,8 +120,10 @@ int unit_add_name(Unit *u, const char *text) { if ((r = unit_name_to_instance(s, &i)) < 0) goto fail; - if (i && unit_vtable[t]->no_instances) + if (i && unit_vtable[t]->no_instances) { + r = -EINVAL; goto fail; + } /* Ensure that this unit is either instanced or not instanced, * but not both. */ @@ -157,7 +161,7 @@ int unit_add_name(Unit *u, const char *text) { u->meta.id = s; u->meta.instance = i; - LIST_PREPEND(Meta, units_per_type, u->meta.manager->units_per_type[t], &u->meta); + LIST_PREPEND(Meta, units_by_type, u->meta.manager->units_by_type[t], &u->meta); if (UNIT_VTABLE(u)->init) UNIT_VTABLE(u)->init(u); @@ -352,7 +356,7 @@ void unit_free(Unit *u) { bidi_set_free(u, u->meta.dependencies[d]); if (u->meta.type != _UNIT_TYPE_INVALID) - LIST_REMOVE(Meta, units_per_type, u->meta.manager->units_per_type[u->meta.type], &u->meta); + LIST_REMOVE(Meta, units_by_type, u->meta.manager->units_by_type[u->meta.type], &u->meta); if (u->meta.in_load_queue) LIST_REMOVE(Meta, load_queue, u->meta.manager->load_queue, &u->meta); @@ -368,7 +372,8 @@ void unit_free(Unit *u) { u->meta.manager->n_in_gc_queue--; } - cgroup_bonding_free_list(u->meta.cgroup_bondings); + cgroup_bonding_free_list(u->meta.cgroup_bondings, u->meta.manager->n_reloading <= 0); + cgroup_attribute_free_list(u->meta.cgroup_attributes); free(u->meta.description); free(u->meta.fragment_path); @@ -567,11 +572,8 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) { /* If syslog or kernel logging is requested, make sure our own * logging daemon is run first. */ - if ((r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_LOGGER_SOCKET, NULL, true)) < 0) - return r; - if (u->meta.manager->running_as == MANAGER_SYSTEM) - if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_LOGGER_SOCKET, NULL, true)) < 0) + if ((r = unit_add_two_dependencies_by_name(u, UNIT_REQUIRES, UNIT_AFTER, SPECIAL_STDOUT_SYSLOG_BRIDGE_SOCKET, NULL, true)) < 0) return r; return 0; @@ -592,7 +594,6 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { Iterator i; char *p2; const char *prefix2; - CGroupBonding *b; char timestamp1[FORMAT_TIMESTAMP_MAX], timestamp2[FORMAT_TIMESTAMP_MAX], @@ -662,20 +663,41 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { } if (u->meta.load_state == UNIT_LOADED) { + CGroupBonding *b; + CGroupAttribute *a; + fprintf(f, "%s\tStopWhenUnneeded: %s\n" "%s\tRefuseManualStart: %s\n" "%s\tRefuseManualStop: %s\n" - "%s\tDefaultDependencies: %s\n", + "%s\tDefaultDependencies: %s\n" + "%s\tOnFailureIsolate: %s\n" + "%s\tIgnoreOnIsolate: %s\n" + "%s\tIgnoreOnSnapshot: %s\n", prefix, yes_no(u->meta.stop_when_unneeded), prefix, yes_no(u->meta.refuse_manual_start), prefix, yes_no(u->meta.refuse_manual_stop), - prefix, yes_no(u->meta.default_dependencies)); + prefix, yes_no(u->meta.default_dependencies), + prefix, yes_no(u->meta.on_failure_isolate), + prefix, yes_no(u->meta.ignore_on_isolate), + prefix, yes_no(u->meta.ignore_on_snapshot)); LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings) fprintf(f, "%s\tControlGroup: %s:%s\n", prefix, b->controller, b->path); + LIST_FOREACH(by_unit, a, u->meta.cgroup_attributes) { + char *v = NULL; + + if (a->map_callback) + a->map_callback(a->controller, a->name, a->value, &v); + + fprintf(f, "%s\tControlGroupAttribute: %s %s \"%s\"\n", + prefix, a->controller, a->name, v ? v : a->value); + + free(v); + } + if (UNIT_VTABLE(u)->dump) UNIT_VTABLE(u)->dump(u, f, prefix2); @@ -815,6 +837,16 @@ int unit_load(Unit *u) { if ((r = unit_add_default_dependencies(u)) < 0) goto fail; + if (u->meta.on_failure_isolate && + set_size(u->meta.dependencies[UNIT_ON_FAILURE]) > 1) { + + log_error("More than one OnFailure= dependencies specified for %s but OnFailureIsolate= enabled. Refusing.", + u->meta.id); + + r = -EINVAL; + goto fail; + } + assert((u->meta.load_state != UNIT_MERGED) == !u->meta.merged_into); unit_add_to_dbus_queue(unit_follow_merge(u)); @@ -1096,8 +1128,17 @@ void unit_trigger_on_failure(Unit *u) { assert(u); - SET_FOREACH(other, u->meta.dependencies[UNIT_ON_FAILURE], i) - manager_add_job(u->meta.manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL); + if (set_size(u->meta.dependencies[UNIT_ON_FAILURE]) <= 0) + return; + + log_info("Triggering OnFailure= dependencies of %s.", u->meta.id); + + SET_FOREACH(other, u->meta.dependencies[UNIT_ON_FAILURE], i) { + int r; + + if ((r = manager_add_job(u->meta.manager, JOB_START, other, u->meta.on_failure_isolate ? JOB_ISOLATE : JOB_REPLACE, true, NULL, NULL)) < 0) + log_error("Failed to enqueue OnFailure= job: %s", strerror(-r)); + } } void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_success) { @@ -1113,7 +1154,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su * behaviour here. For example: if a mount point is remounted * this function will be called too! */ - if (u->meta.manager->n_deserializing <= 0) { + if (u->meta.manager->n_reloading <= 0) { dual_timestamp ts; dual_timestamp_get(&ts); @@ -1201,7 +1242,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su } else unexpected = true; - if (u->meta.manager->n_deserializing <= 0) { + if (u->meta.manager->n_reloading <= 0) { /* If this state change happened without being * requested by a job, then let's retroactively start @@ -1221,55 +1262,56 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su log_notice("Unit %s entered failed state.", u->meta.id); unit_trigger_on_failure(u); } + } + /* Some names are special */ + if (UNIT_IS_ACTIVE_OR_RELOADING(ns)) { + + if (unit_has_name(u, SPECIAL_DBUS_SERVICE)) + /* The bus just might have become available, + * hence try to connect to it, if we aren't + * yet connected. */ + bus_init(u->meta.manager, true); + + if (u->meta.type == UNIT_SERVICE && + !UNIT_IS_ACTIVE_OR_RELOADING(os) && + u->meta.manager->n_reloading <= 0) { + /* Write audit record if we have just finished starting up */ + manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, true); + u->meta.in_audit = true; + } - /* Some names are special */ - if (UNIT_IS_ACTIVE_OR_RELOADING(ns)) { - - if (unit_has_name(u, SPECIAL_DBUS_SERVICE)) - /* The bus just might have become available, - * hence try to connect to it, if we aren't - * yet connected. */ - bus_init(u->meta.manager, true); - - if (u->meta.type == UNIT_SERVICE && - !UNIT_IS_ACTIVE_OR_RELOADING(os)) { - /* Write audit record if we have just finished starting up */ - manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, true); - u->meta.in_audit = true; - } - - if (!UNIT_IS_ACTIVE_OR_RELOADING(os)) - manager_send_unit_plymouth(u->meta.manager, u); + if (!UNIT_IS_ACTIVE_OR_RELOADING(os)) + manager_send_unit_plymouth(u->meta.manager, u); - } else { + } else { - /* We don't care about D-Bus here, since we'll get an - * asynchronous notification for it anyway. */ + /* We don't care about D-Bus here, since we'll get an + * asynchronous notification for it anyway. */ - if (u->meta.type == UNIT_SERVICE && - UNIT_IS_INACTIVE_OR_FAILED(ns) && - !UNIT_IS_INACTIVE_OR_FAILED(os)) { + if (u->meta.type == UNIT_SERVICE && + UNIT_IS_INACTIVE_OR_FAILED(ns) && + !UNIT_IS_INACTIVE_OR_FAILED(os) && + u->meta.manager->n_reloading <= 0) { - /* Hmm, if there was no start record written - * write it now, so that we always have a nice - * pair */ - if (!u->meta.in_audit) { - manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE); + /* Hmm, if there was no start record written + * write it now, so that we always have a nice + * pair */ + if (!u->meta.in_audit) { + manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE); - if (ns == UNIT_INACTIVE) - manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, true); - } else - /* Write audit record if we have just finished shutting down */ - manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE); + if (ns == UNIT_INACTIVE) + manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, true); + } else + /* Write audit record if we have just finished shutting down */ + manager_send_unit_audit(u->meta.manager, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE); - u->meta.in_audit = false; - } + u->meta.in_audit = false; } - - manager_recheck_syslog(u->meta.manager); } + manager_recheck_syslog(u->meta.manager); + /* Maybe we finished startup and are now ready for being * stopped because unneeded? */ unit_check_unneeded(u); @@ -1716,10 +1758,13 @@ int unit_add_cgroup(Unit *u, CGroupBonding *b) { assert(b->path); - if (!b->controller) + if (!b->controller) { if (!(b->controller = strdup(SYSTEMD_CGROUP_CONTROLLER))) return -ENOMEM; + b->ours = true; + } + /* Ensure this hasn't been added yet */ assert(!b->unit); @@ -1743,27 +1788,28 @@ int unit_add_cgroup(Unit *u, CGroupBonding *b) { static char *default_cgroup_path(Unit *u) { char *p; - int r; assert(u); if (u->meta.instance) { char *t; - if (!(t = unit_name_template(u->meta.id))) + t = unit_name_template(u->meta.id); + if (!t) return NULL; - r = asprintf(&p, "%s/%s/%s", u->meta.manager->cgroup_hierarchy, t, u->meta.instance); + p = join(u->meta.manager->cgroup_hierarchy, "/", t, "/", u->meta.instance, NULL); free(t); } else - r = asprintf(&p, "%s/%s", u->meta.manager->cgroup_hierarchy, u->meta.id); + p = join(u->meta.manager->cgroup_hierarchy, "/", u->meta.id, NULL); - return r < 0 ? NULL : p; + return p; } int unit_add_cgroup_from_text(Unit *u, const char *name) { char *controller = NULL, *path = NULL; CGroupBonding *b = NULL; + bool ours = false; int r; assert(u); @@ -1772,11 +1818,15 @@ int unit_add_cgroup_from_text(Unit *u, const char *name) { if ((r = cg_split_spec(name, &controller, &path)) < 0) return r; - if (!path) + if (!path) { path = default_cgroup_path(u); + ours = true; + } - if (!controller) + if (!controller) { controller = strdup(SYSTEMD_CGROUP_CONTROLLER); + ours = true; + } if (!path || !controller) { free(path); @@ -1797,7 +1847,8 @@ int unit_add_cgroup_from_text(Unit *u, const char *name) { b->controller = controller; b->path = path; - b->ours = false; + b->ours = ours; + b->essential = streq(controller, SYSTEMD_CGROUP_CONTROLLER); if ((r = unit_add_cgroup(u, b)) < 0) goto fail; @@ -1850,19 +1901,26 @@ fail: } int unit_add_default_cgroups(Unit *u) { + CGroupAttribute *a; char **c; int r; + assert(u); /* Adds in the default cgroups, if they weren't specified * otherwise. */ + if (!u->meta.manager->cgroup_hierarchy) + return 0; + if ((r = unit_add_one_default_cgroup(u, NULL)) < 0) return r; STRV_FOREACH(c, u->meta.manager->default_controllers) - if ((r = unit_add_one_default_cgroup(u, *c)) < 0) - return r; + unit_add_one_default_cgroup(u, *c); + + LIST_FOREACH(by_unit, a, u->meta.cgroup_attributes) + unit_add_one_default_cgroup(u, a->controller); return 0; } @@ -1873,6 +1931,69 @@ CGroupBonding* unit_get_default_cgroup(Unit *u) { return cgroup_bonding_find_list(u->meta.cgroup_bondings, SYSTEMD_CGROUP_CONTROLLER); } +int unit_add_cgroup_attribute(Unit *u, const char *controller, const char *name, const char *value, CGroupAttributeMapCallback map_callback) { + int r; + char *c = NULL; + CGroupAttribute *a; + + assert(u); + assert(name); + assert(value); + + if (!controller) { + const char *dot; + + dot = strchr(name, '.'); + if (!dot) + return -EINVAL; + + c = strndup(name, dot - name); + if (!c) + return -ENOMEM; + + controller = c; + } + + if (streq(controller, SYSTEMD_CGROUP_CONTROLLER)) { + r = -EINVAL; + goto finish; + } + + a = new0(CGroupAttribute, 1); + if (!a) { + r = -ENOMEM; + goto finish; + } + + if (c) { + a->controller = c; + c = NULL; + } else + a->controller = strdup(controller); + + a->name = strdup(name); + a->value = strdup(value); + + if (!a->controller || !a->name || !a->value) { + free(a->controller); + free(a->name); + free(a->value); + free(a); + + return -ENOMEM; + } + + a->map_callback = map_callback; + + LIST_PREPEND(CGroupAttribute, by_unit, u->meta.cgroup_attributes, a); + + r = 0; + +finish: + free(c); + return r; +} + int unit_load_related_unit(Unit *u, const char *type, Unit **_found) { char *t; int r; @@ -1966,6 +2087,47 @@ static char *specifier_filename(char specifier, void *data, void *userdata) { return unit_name_to_path(u->meta.instance); } +static char *specifier_cgroup(char specifier, void *data, void *userdata) { + Unit *u = userdata; + assert(u); + + return default_cgroup_path(u); +} + +static char *specifier_cgroup_root(char specifier, void *data, void *userdata) { + Unit *u = userdata; + char *p; + assert(u); + + if (specifier == 'r') + return strdup(u->meta.manager->cgroup_hierarchy); + + if (parent_of_path(u->meta.manager->cgroup_hierarchy, &p) < 0) + return strdup(""); + + if (streq(p, "/")) { + free(p); + return strdup(""); + } + + return p; +} + +static char *specifier_runtime(char specifier, void *data, void *userdata) { + Unit *u = userdata; + assert(u); + + if (u->meta.manager->running_as == MANAGER_USER) { + const char *e; + + e = getenv("XDG_RUNTIME_DIR"); + if (e) + return strdup(e); + } + + return strdup("/run"); +} + char *unit_name_printf(Unit *u, const char* format) { /* @@ -1995,7 +2157,13 @@ char *unit_name_printf(Unit *u, const char* format) { char *unit_full_printf(Unit *u, const char *format) { /* This is similar to unit_name_printf() but also supports - * unescaping */ + * unescaping. Also, adds a couple of additional codes: + * + * %c cgroup path of unit + * %r root cgroup path of this systemd instance (e.g. "/user/lennart/shared/systemd-4711") + * %R parent of root cgroup path (e.g. "/usr/lennart/shared") + * %t the runtime directory to place sockets in (e.g. "/run" or $XDG_RUNTIME_DIR) + */ const Specifier table[] = { { 'n', specifier_string, u->meta.id }, @@ -2005,6 +2173,10 @@ char *unit_full_printf(Unit *u, const char *format) { { 'i', specifier_string, u->meta.instance }, { 'I', specifier_instance_unescaped, NULL }, { 'f', specifier_filename, NULL }, + { 'c', specifier_cgroup, NULL }, + { 'r', specifier_cgroup_root, NULL }, + { 'R', specifier_cgroup_root, NULL }, + { 't', specifier_runtime, NULL }, { 0, NULL, NULL } }; @@ -2034,8 +2206,7 @@ char **unit_full_printf_strv(Unit *u, char **l) { return r; fail: - j--; - while (j >= r) + for (j--; j >= r; j--) free(*j); free(r); @@ -2134,7 +2305,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) { return 0; for (;;) { - char line[1024], *l, *v; + char line[LINE_MAX], *l, *v; size_t k; if (!fgets(line, sizeof(line), f)) { @@ -2242,7 +2413,7 @@ int unit_coldplug(Unit *u) { return r; if (u->meta.deserialized_job >= 0) { - if ((r = manager_add_job(u->meta.manager, u->meta.deserialized_job, u, JOB_IGNORE_DEPENDENCIES, false, NULL, NULL)) < 0) + if ((r = manager_add_job(u->meta.manager, u->meta.deserialized_job, u, JOB_IGNORE_REQUIREMENTS, false, NULL, NULL)) < 0) return r; u->meta.deserialized_job = _JOB_TYPE_INVALID; @@ -2260,13 +2431,7 @@ void unit_status_printf(Unit *u, const char *format, ...) { if (!UNIT_VTABLE(u)->show_status) return; - if (u->meta.manager->running_as != MANAGER_SYSTEM) - return; - - /* If Plymouth is running make sure we show the status, so - * that there's something nice to see when people press Esc */ - - if (!u->meta.manager->show_status && !plymouth_running()) + if (!manager_get_show_status(u->meta.manager)) return; if (!manager_is_booting_or_shutting_down(u->meta.manager)) @@ -2278,21 +2443,25 @@ void unit_status_printf(Unit *u, const char *format, ...) { } bool unit_need_daemon_reload(Unit *u) { - struct stat st; - assert(u); - if (!u->meta.fragment_path) - return false; + if (u->meta.fragment_path) { + struct stat st; - zero(st); - if (stat(u->meta.fragment_path, &st) < 0) - /* What, cannot access this anymore? */ - return true; + zero(st); + if (stat(u->meta.fragment_path, &st) < 0) + /* What, cannot access this anymore? */ + return true; + + if (u->meta.fragment_mtime > 0 && + timespec_load(&st.st_mtim) != u->meta.fragment_mtime) + return true; + } + + if (UNIT_VTABLE(u)->need_daemon_reload) + return UNIT_VTABLE(u)->need_daemon_reload(u); - return - u->meta.fragment_mtime && - timespec_load(&st.st_mtim) != u->meta.fragment_mtime; + return false; } void unit_reset_failed(Unit *u) { @@ -2380,7 +2549,6 @@ int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error) { return UNIT_VTABLE(u)->kill(u, w, m, signo, error); } - int unit_following_set(Unit *u, Set **s) { assert(u); assert(s); @@ -2392,6 +2560,17 @@ int unit_following_set(Unit *u, Set **s) { return 0; } +UnitFileState unit_get_unit_file_state(Unit *u) { + assert(u); + + if (u->meta.unit_file_state < 0 && u->meta.fragment_path) + u->meta.unit_file_state = unit_file_get_state( + u->meta.manager->running_as == MANAGER_SYSTEM ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, + NULL, file_name_from_path(u->meta.fragment_path)); + + return u->meta.unit_file_state; +} + static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = { [UNIT_STUB] = "stub", [UNIT_LOADED] = "loaded",