From: Chris Down <chris@chrisdown.name>
Date: Tue, 16 Apr 2019 17:14:09 +0000 (+0100)
Subject: cgroup: Create UNIT_DEFINE_ANCESTOR_MEMORY_LOOKUP
X-Git-Tag: v243-rc1~524^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6264b85e92aeddb74b8d8808a08c9eae8390a6a5;p=thirdparty%2Fsystemd.git

cgroup: Create UNIT_DEFINE_ANCESTOR_MEMORY_LOOKUP

This is in preparation for creating unit_get_ancestor_memory_min.
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index ceb7ee21892..8884981b29d 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -384,31 +384,36 @@ int cgroup_add_device_allow(CGroupContext *c, const char *dev, const char *mode)
         return 0;
 }
 
-uint64_t unit_get_ancestor_memory_low(Unit *u) {
-        CGroupContext *c;
-
-        /* 1. Is MemoryLow set in this unit? If so, use that.
-         * 2. Is DefaultMemoryLow set in any ancestor? If so, use that.
-         * 3. Otherwise, return CGROUP_LIMIT_MIN. */
-
-        assert(u);
-
-        c = unit_get_cgroup_context(u);
-
-        if (c->memory_low_set)
-                return c->memory_low;
-
-        while (UNIT_ISSET(u->slice)) {
-                u = UNIT_DEREF(u->slice);
-                c = unit_get_cgroup_context(u);
-
-                if (c->default_memory_low_set)
-                        return c->default_memory_low;
-        }
-
-        /* We've reached the root, but nobody had DefaultMemoryLow set, so set it to the kernel default. */
-        return CGROUP_LIMIT_MIN;
-}
+#define UNIT_DEFINE_ANCESTOR_MEMORY_LOOKUP(entry)                       \
+        uint64_t unit_get_ancestor_##entry(Unit *u) {                   \
+                CGroupContext *c;                                       \
+                                                                        \
+                /* 1. Is entry set in this unit? If so, use that.       \
+                 * 2. Is the default for this entry set in any          \
+                 *    ancestor? If so, use that.                        \
+                 * 3. Otherwise, return CGROUP_LIMIT_MIN. */            \
+                                                                        \
+                assert(u);                                              \
+                                                                        \
+                c = unit_get_cgroup_context(u);                         \
+                                                                        \
+                if (c->entry##_set)                                     \
+                        return c->entry;                                \
+                                                                        \
+                while (UNIT_ISSET(u->slice)) {                          \
+                        u = UNIT_DEREF(u->slice);                       \
+                        c = unit_get_cgroup_context(u);                 \
+                                                                        \
+                        if (c->default_##entry##_set)                   \
+                                return c->default_##entry;              \
+                }                                                       \
+                                                                        \
+                /* We've reached the root, but nobody had default for   \
+                 * this entry set, so set it to the kernel default. */  \
+                return CGROUP_LIMIT_MIN;                                \
+}
+
+UNIT_DEFINE_ANCESTOR_MEMORY_LOOKUP(memory_low);
 
 static void cgroup_xattr_apply(Unit *u) {
         char ids[SD_ID128_STRING_MAX];