X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fcgroup-util.c;h=b48642588da94c78efb5393094cb8582da8e1d7b;hb=3d1092eab0f4a5c771225c78072a7b6eccb82849;hp=bd17b5ee56c9912fe070d1b1d568fc0c544c4dc6;hpb=c286398e07a7a16aa88a3437318cb2edf8c082c1;p=elogind.git

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index bd17b5ee5..b48642588 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -461,7 +461,7 @@ static const char *controller_to_dirname(const char *controller) {
         if (e)
                 return e;
 
-                return controller;
+        return controller;
 }
 
 static int join_path_legacy(const char *controller, const char *path, const char *suffix, char **fs) {
@@ -520,7 +520,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
                  * *below* the controllers, without any prefix. */
 
                 if (!path && !suffix)
-                return -EINVAL;
+                        return -EINVAL;
 
                 if (!suffix)
                         t = strdup(path);
@@ -546,12 +546,13 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch
                 r = join_path_unified(path, suffix, fs);
         else
                 r = join_path_legacy(controller, path, suffix, fs);
-                if (r < 0)
-                        return r;
+
+        if (r < 0)
+                return r;
 
         path_kill_slashes(*fs);
         return 0;
-        }
+}
 
 static int controller_is_accessible(const char *controller) {
         int unified;
@@ -706,7 +707,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
 
         snprintf(c, sizeof(c), PID_FMT"\n", pid);
 
-        return write_string_file_no_create(fs, c);
+        return write_string_file(fs, c, 0);
 }
 
 int cg_attach_fallback(const char *controller, const char *path, pid_t pid) {
@@ -825,6 +826,8 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         }
 
         fs = procfs_file_alloca(pid, "cgroup");
+        log_debug_elogind("Searching for PID %u in \"%s\" (controller \"%s\")",
+                          pid, fs, controller);
         f = fopen(fs, "re");
         if (!f)
                 return errno == ENOENT ? -ESRCH : -errno;
@@ -869,6 +872,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
                                 continue;
                 }
 
+                log_debug_elogind("Found %s:%s", line, e+1);
                 p = strdup(e + 1);
                 if (!p)
                         return -ENOMEM;
@@ -903,7 +907,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
 
         sc = strstrip(contents);
         if (isempty(sc)) {
-                r = write_string_file_no_create(fs, agent);
+                r = write_string_file(fs, agent, 0);
                 if (r < 0)
                         return r;
         } else if (!path_equal(sc, agent))
@@ -921,7 +925,7 @@ int cg_install_release_agent(const char *controller, const char *agent) {
 
         sc = strstrip(contents);
         if (streq(sc, "0")) {
-                r = write_string_file_no_create(fs, "1");
+                r = write_string_file(fs, "1", 0);
                 if (r < 0)
                         return r;
 
@@ -948,7 +952,7 @@ int cg_uninstall_release_agent(const char *controller) {
         if (r < 0)
                 return r;
 
-        r = write_string_file_no_create(fs, "0");
+        r = write_string_file(fs, "0", 0);
         if (r < 0)
                 return r;
 
@@ -958,7 +962,7 @@ int cg_uninstall_release_agent(const char *controller) {
         if (r < 0)
                 return r;
 
-        r = write_string_file_no_create(fs, "");
+        r = write_string_file(fs, "", 0);
         if (r < 0)
                 return r;
 
@@ -1005,8 +1009,8 @@ int cg_is_empty_recursive(const char *controller, const char *path) {
                  * via the "cgroup.populated" attribute. */
 
                 r = cg_get_path(controller, path, "cgroup.populated", &populated);
-        if (r < 0)
-                return r;
+                if (r < 0)
+                        return r;
 
                 r = read_one_line_file(populated, &t);
                 if (r == -ENOENT)
@@ -1016,33 +1020,33 @@ int cg_is_empty_recursive(const char *controller, const char *path) {
 
                 return streq(t, "0");
         } else {
-        _cleanup_closedir_ DIR *d = NULL;
-        char *fn;
+                _cleanup_closedir_ DIR *d = NULL;
+                char *fn;
 
                 r = cg_is_empty(controller, path);
-        if (r <= 0)
-                return r;
+                if (r <= 0)
+                        return r;
 
-        r = cg_enumerate_subgroups(controller, path, &d);
-                if (r == -ENOENT)
-                        return 1;
-        if (r < 0)
+                r = cg_enumerate_subgroups(controller, path, &d);
+                        if (r == -ENOENT)
+                                return 1;
+                if (r < 0)
                         return r;
 
-        while ((r = cg_read_subgroup(d, &fn)) > 0) {
-                _cleanup_free_ char *p = NULL;
+                while ((r = cg_read_subgroup(d, &fn)) > 0) {
+                        _cleanup_free_ char *p = NULL;
 
-                p = strjoin(path, "/", fn, NULL);
-                free(fn);
-                if (!p)
-                        return -ENOMEM;
+                        p = strjoin(path, "/", fn, NULL);
+                        free(fn);
+                        if (!p)
+                                return -ENOMEM;
 
                         r = cg_is_empty_recursive(controller, p);
-                if (r <= 0)
+                        if (r <= 0)
+                                return r;
+                }
+                if (r < 0)
                         return r;
-        }
-        if (r < 0)
-                return r;
 
                 return true;
         }
@@ -1725,7 +1729,7 @@ char *cg_escape(const char *p) {
                                 if (memcmp(p, n, l) != 0)
                                         continue;
 
-                                        need_prefix = true;
+                                need_prefix = true;
                                 break;
                         }
                 }
@@ -1734,7 +1738,7 @@ char *cg_escape(const char *p) {
         if (need_prefix)
                 return strappend("_", p);
 
-                return strdup(p);
+        return strdup(p);
 }
 
 char *cg_unescape(const char *p) {
@@ -1856,7 +1860,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri
         if (r < 0)
                 return r;
 
-        return write_string_file_no_create(p, value);
+        return write_string_file(p, value, 0);
 }
 
 /// UNNEEDED by elogind
@@ -2178,7 +2182,7 @@ int cg_unified(void) {
         else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC))
 #else
         if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC))
-#endif // elogind
+#endif // 0
                 unified_cache = false;
         else
                 return -ENOEXEC;
@@ -2270,6 +2274,10 @@ bool cg_is_unified_wanted(void) {
 bool cg_is_legacy_wanted(void) {
         return !cg_is_unified_wanted();
 }
+#else
+bool cg_is_legacy_wanted(void) {
+        return true;
+}
 #endif // 0
 
 static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {