X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=unit.c;h=a8058500d1411070e0f20bef675b279b9ae263f8;hp=6fa878345fcf8f9c89ed5bd90beb4742bd8775d1;hb=013b87c09199926434583e8bb54ac6cb4b835eb5;hpb=a096ed36f043770ee35cd4d2d292ba0e67ba2c1b

diff --git a/unit.c b/unit.c
index 6fa878345..a8058500d 100644
--- a/unit.c
+++ b/unit.c
@@ -219,6 +219,7 @@ int unit_set_description(Unit *u, const char *description) {
 
 void unit_add_to_load_queue(Unit *u) {
         assert(u);
+        assert(u->meta.type != _UNIT_TYPE_INVALID);
 
         if (u->meta.load_state != UNIT_STUB || u->meta.in_load_queue)
                 return;
@@ -239,6 +240,7 @@ void unit_add_to_cleanup_queue(Unit *u) {
 
 void unit_add_to_dbus_queue(Unit *u) {
         assert(u);
+        assert(u->meta.type != _UNIT_TYPE_INVALID);
 
         if (u->meta.load_state == UNIT_STUB || u->meta.in_dbus_queue || set_isempty(u->meta.manager->subscribed))
                 return;
@@ -394,6 +396,8 @@ int unit_merge(Unit *u, Unit *other) {
         assert(other);
         assert(u->meta.manager == other->meta.manager);
 
+        other = unit_follow_merge(other);
+
         if (other == u)
                 return 0;
 
@@ -403,7 +407,14 @@ int unit_merge(Unit *u, Unit *other) {
         if (u->meta.type != u->meta.type)
                 return -EINVAL;
 
-        if (other->meta.load_state != UNIT_STUB)
+        if (other->meta.load_state != UNIT_STUB &&
+            other->meta.load_state != UNIT_FAILED)
+                return -EEXIST;
+
+        if (other->meta.job)
+                return -EEXIST;
+
+        if (unit_active_state(other) != UNIT_INACTIVE)
                 return -EEXIST;
 
         /* Merge names */
@@ -413,11 +424,16 @@ int unit_merge(Unit *u, Unit *other) {
         for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
                 merge_dependencies(u, other, d);
 
-        unit_add_to_dbus_queue(u);
-
         other->meta.load_state = UNIT_MERGED;
         other->meta.merged_into = u;
 
+        /* If there is still some data attached to the other node, we
+         * don't need it anymore, and can free it. */
+        if (other->meta.load_state != UNIT_STUB)
+                if (UNIT_VTABLE(other)->done)
+                        UNIT_VTABLE(other)->done(other);
+
+        unit_add_to_dbus_queue(u);
         unit_add_to_cleanup_queue(other);
 
         return 0;
@@ -491,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);
 
@@ -503,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);
@@ -518,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);
@@ -834,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);
@@ -1290,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;
 
@@ -1348,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;
@@ -1372,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;