X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=unit.c;h=6d6f56416d1bfb0c6976230546e3ef6855ba9c2f;hp=d4f0538b36edc901a1b86336d4e226b6a515a685;hb=b152adec93b05c0d01b240e0f28326eb1d8e18e9;hpb=3616a49cb0140ad1832ed861d9d9eb1ae632398e diff --git a/unit.c b/unit.c index d4f0538b3..6d6f56416 100644 --- a/unit.c +++ b/unit.c @@ -507,6 +507,7 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { char *p2; const char *prefix2; CGroupBonding *b; + char timestamp1[FORMAT_TIMESTAMP_MAX], timestamp2[FORMAT_TIMESTAMP_MAX]; assert(u); @@ -519,11 +520,15 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { "%s→ Unit %s:\n" "%s\tDescription: %s\n" "%s\tUnit Load State: %s\n" - "%s\tUnit Active State: %s\n", + "%s\tUnit Active State: %s\n" + "%s\tActive Enter Timestamp: %s\n" + "%s\tActive Exit Timestamp: %s\n", prefix, unit_id(u), prefix, unit_description(u), prefix, unit_load_state_to_string(u->meta.load_state), - prefix, unit_active_state_to_string(unit_active_state(u))); + prefix, unit_active_state_to_string(unit_active_state(u)), + prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->meta.active_enter_timestamp)), + prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->meta.active_exit_timestamp))); SET_FOREACH(t, u->meta.names, i) fprintf(f, "%s\tName: %s\n", prefix, t); @@ -534,27 +539,28 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) { for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) { Unit *other; - if (set_isempty(u->meta.dependencies[d])) - continue; - SET_FOREACH(other, u->meta.dependencies[d], i) fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), unit_id(other)); } - fprintf(f, - "%s\tRecursive Stop: %s\n" - "%s\tStop When Unneeded: %s\n", - prefix, yes_no(u->meta.recursive_stop), - prefix, yes_no(u->meta.stop_when_unneeded)); - if (u->meta.load_state == UNIT_LOADED) { + fprintf(f, + "%s\tRecursive Stop: %s\n" + "%s\tStop When Unneeded: %s\n", + prefix, yes_no(u->meta.recursive_stop), + prefix, yes_no(u->meta.stop_when_unneeded)); + LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings) fprintf(f, "%s\tControlGroup: %s:%s\n", prefix, b->controller, b->path); if (UNIT_VTABLE(u)->dump) UNIT_VTABLE(u)->dump(u, f, prefix2); - } + + } else if (u->meta.load_state == UNIT_MERGED) + fprintf(f, + "%s\tMerged into: %s\n", + prefix, unit_id(u->meta.merged_into)); if (u->meta.job) job_dump(u->meta.job, f, prefix2); @@ -850,8 +856,12 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) { assert(!(os == UNIT_ACTIVE && ns == UNIT_ACTIVATING)); assert(!(os == UNIT_INACTIVE && ns == UNIT_DEACTIVATING)); - if (os == ns) - return; + /* Note that this is called for all low-level state changes, + * even if they might map to the same high-level + * UnitActiveState! That means that ns == os is OK an expected + * behaviour here. For example: if a mount point is remounted + * this function will be called too and the utmp code below + * relies on that! */ if (!UNIT_IS_ACTIVE_OR_RELOADING(os) && UNIT_IS_ACTIVE_OR_RELOADING(ns)) u->meta.active_enter_timestamp = now(CLOCK_REALTIME); @@ -1306,55 +1316,72 @@ int unit_add_cgroup(Unit *u, CGroupBonding *b) { return 0; } +static char *default_cgroup_path(Unit *u) { + char *p; + + assert(u); + + if (asprintf(&p, "%s/%s", u->meta.manager->cgroup_hierarchy, unit_id(u)) < 0) + return NULL; + + return p; +} + int unit_add_cgroup_from_text(Unit *u, const char *name) { size_t n; - const char *p; - char *controller; - CGroupBonding *b; + char *controller = NULL, *path = NULL; + CGroupBonding *b = NULL; int r; assert(u); assert(name); /* Detect controller name */ - n = strcspn(name, ":/"); + n = strcspn(name, ":"); - /* Only controller name, no path? No path? */ - if (name[n] == 0) - return -EINVAL; + if (name[n] == 0 || + (name[n] == ':' && name[n+1] == 0)) { - if (n > 0) { - if (name[n] != ':') - return -EINVAL; + /* Only controller name, no path? */ - p = name+n+1; - } else - p = name; + if (!(path = default_cgroup_path(u))) + return -ENOMEM; - /* Insist in absolute paths */ - if (p[0] != '/') - return -EINVAL; + } else { + const char *p; - if (!(controller = strndup(name, n))) - return -ENOMEM; + /* Controller name, and path. */ + p = name+n+1; - if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller)) { - free(controller); - return -EEXIST; + if (!path_is_absolute(p)) + return -EINVAL; + + if (!(path = strdup(p))) + return -ENOMEM; } - if (!(b = new0(CGroupBonding, 1))) { - free(controller); - return -ENOMEM; + if (n > 0) + controller = strndup(name, n); + else + controller = strdup(u->meta.manager->cgroup_controller); + + if (!controller) { + r = -ENOMEM; + goto fail; } - b->controller = controller; + if (cgroup_bonding_find_list(u->meta.cgroup_bondings, controller)) { + r = -EEXIST; + goto fail; + } - if (!(b->path = strdup(p))) { + if (!(b = new0(CGroupBonding, 1))) { r = -ENOMEM; goto fail; } + b->controller = controller; + b->path = path; b->only_us = false; b->clean_up = false; @@ -1364,8 +1391,8 @@ int unit_add_cgroup_from_text(Unit *u, const char *name) { return 0; fail: - free(b->path); - free(b->controller); + free(path); + free(controller); free(b); return r; @@ -1388,7 +1415,7 @@ int unit_add_default_cgroup(Unit *u) { if (!(b->controller = strdup(u->meta.manager->cgroup_controller))) goto fail; - if (asprintf(&b->path, "%s/%s", u->meta.manager->cgroup_hierarchy, unit_id(u)) < 0) + if (!(b->path = default_cgroup_path(u))) goto fail; b->clean_up = true; @@ -1413,6 +1440,28 @@ CGroupBonding* unit_get_default_cgroup(Unit *u) { return cgroup_bonding_find_list(u->meta.cgroup_bondings, u->meta.manager->cgroup_controller); } +int unit_load_related_unit(Unit *u, const char *type, Unit **_found) { + char *t; + int r; + + assert(u); + assert(type); + assert(_found); + + if (!(t = unit_name_change_suffix(unit_id(u), type))) + return -ENOMEM; + + assert(!unit_has_name(u, t)); + + r = manager_load_unit(u->meta.manager, t, _found); + free(t); + + if (r >= 0) + assert(*_found != u); + + return r; +} + static const char* const unit_type_table[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = "service", [UNIT_TIMER] = "timer",