Add support for building elogind against musl libc

[elogind.git] / src / basic / cgroup-util.c

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 92d09f0b5cf8248dbeae92d4dc3b0d681e396519..c83010d8ad8945d92b70d5b936eff3ef2b14e633 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -297,6 +297,10 @@ int cg_migrate(const char *cfrom, const char *pfrom, const char *cto, const char
 
         my_pid = getpid();
 
+        log_debug_elogind("Migrating \"%s\"/\"%s\" to \"%s\"/\"%s\" (%s)",
+                          cfrom, pfrom, cto, pto,
+                          ignore_self ? "ignoring self" : "watching self");
+
         do {
                 _cleanup_fclose_ FILE *f = NULL;
                 pid_t pid = 0;
@@ -457,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) {
@@ -542,8 +546,9 @@ 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;
@@ -821,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;
@@ -865,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;
@@ -1001,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)
@@ -1012,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;
         }
@@ -1199,10 +1207,11 @@ int cg_shift_path(const char *cgroup, const char *root, const char **shifted) {
                         return r;
 
                 root = rt;
+                log_debug_elogind("Determined root path: \"%s\"", root);
         }
 
         p = path_startswith(cgroup, root);
-        if (p && p > cgroup)
+        if (p && p[0] && (p > cgroup))
                 *shifted = p - 1;
         else
                 *shifted = cgroup;
@@ -1222,6 +1231,8 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
         if (r < 0)
                 return r;
 
+        log_debug_elogind("Shifting path: \"%s\" (PID %u, root: \"%s\")",
+                          raw, pid, root ? root : "NULL");
         r = cg_shift_path(raw, root, &c);
         if (r < 0)
                 return r;
@@ -1238,6 +1249,7 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) {
 
                 *cgroup = n;
         }
+        log_debug_elogind("Resulting cgroup:\"%s\"", *cgroup);
 
         return 0;
 }
@@ -1522,6 +1534,7 @@ int cg_path_get_session(const char *path, char **session) {
         const char *e, *n, *start;
 
         assert(path);
+        log_debug_elogind("path is \"%s\"", path);
         assert(path[0] == '/');
 
         e = path + 1;
@@ -1539,6 +1552,7 @@ int cg_path_get_session(const char *path, char **session) {
         if (session) {
                 char *rr;
 
+                log_debug_elogind("found session: \"%s\"", start);
                 rr = strdup(start);
                 if (!rr)
                         return -ENOMEM;
@@ -1715,7 +1729,7 @@ char *cg_escape(const char *p) {
                                 if (memcmp(p, n, l) != 0)
                                         continue;
 
-                                        need_prefix = true;
+                                need_prefix = true;
                                 break;
                         }
                 }
@@ -1724,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) {
@@ -1897,7 +1911,6 @@ int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path
 
         return 0;
 }
-#endif // 0
 
 int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_migrate_callback_t path_callback, void *userdata) {
         CGroupController c;
@@ -1932,8 +1945,6 @@ int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_m
         return 0;
 }
 
-/// UNNEEDED by elogind
-#if 0
 int cg_attach_many_everywhere(CGroupMask supported, const char *path, Set* pids, cg_migrate_callback_t path_callback, void *userdata) {
         Iterator i;
         void *pidp;
@@ -2171,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;
@@ -2227,7 +2238,6 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
 
         return 0;
 }
-#endif // 0
 
 bool cg_is_unified_wanted(void) {
         static thread_local int wanted = -1;
@@ -2261,8 +2271,6 @@ bool cg_is_unified_wanted(void) {
         }
 }
 
-/// UNNEEDED by elogind
-#if 0
 bool cg_is_legacy_wanted(void) {
         return !cg_is_unified_wanted();
 }