From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 17 Jan 2018 17:41:42 +0000 (+0100)
Subject: cgroup: add proper API to determine whether our unit manags to root cgroup
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e944316f6eecad97dd6abe1f9e0fbd05aead7442;p=elogind.git

cgroup: add proper API to determine whether our unit manags to root cgroup
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 8ebb3d2b9..2e70aa79a 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -39,6 +39,18 @@
 
 #define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC)
 
+bool unit_has_root_cgroup(Unit *u) {
+        assert(u);
+
+        /* Returns whether this unit manages the root cgroup. Note that this is different from being named "-.slice",
+         * as inside of containers the root slice won't be identical to the root cgroup. */
+
+        if (!u->cgroup_path)
+                return false;
+
+        return isempty(u->cgroup_path) || path_equal(u->cgroup_path, "/");
+}
+
 #if 0 /// UNNEEDED by elogind
 static void cgroup_compat_warn(void) {
         static bool cgroup_compat_warned = false;
@@ -709,21 +721,17 @@ static void cgroup_context_apply(
 
         assert(u);
 
-        c = unit_get_cgroup_context(u);
-        path = u->cgroup_path;
-
-        assert(c);
-        assert(path);
-
         /* Nothing to do? Exit early! */
         if (apply_mask == 0 && !apply_bpf)
                 return;
 
-        /* Some cgroup attributes are not supported on the root cgroup,
-         * hence silently ignore */
-        is_root = isempty(path) || path_equal(path, "/");
-        if (is_root)
-                /* Make sure we don't try to display messages with an empty path. */
+        /* Some cgroup attributes are not supported on the root cgroup, hence silently ignore */
+        is_root = unit_has_root_cgroup(u);
+
+        assert_se(c = unit_get_cgroup_context(u));
+        assert_se(path = u->cgroup_path);
+
+        if (is_root) /* Make sure we don't try to display messages with an empty path. */
                 path = "/";
 
         /* We generally ignore errors caused by read-only mounted
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 1c43c0d14..3724b8ba1 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -197,8 +197,6 @@ Unit* manager_get_unit_by_pid(Manager *m, pid_t pid);
 int unit_search_main_pid(Unit *u, pid_t *ret);
 int unit_watch_all_pids(Unit *u);
 
-int unit_synthesize_cgroup_empty_event(Unit *u);
-
 int unit_get_memory_current(Unit *u, uint64_t *ret);
 int unit_get_tasks_current(Unit *u, uint64_t *ret);
 int unit_get_cpu_usage(Unit *u, nsec_t *ret);
@@ -214,6 +212,8 @@ int unit_reset_ip_accounting(Unit *u);
         })
 
 #endif // 0
+bool unit_has_root_cgroup(Unit *u);
+
 int manager_notify_cgroup_empty(Manager *m, const char *group);
 
 #if 0 /// UNNEEDED by elogind