From: Tom Hromatka <tom.hromatka@oracle.com>
Date: Thu, 7 Dec 2023 04:19:07 +0000 (+0000)
Subject: python: compile systemd support by default
X-Git-Tag: v3.2.0~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86217e811073bb02ebeb8d24cfc112142fe8fcd4;p=thirdparty%2Flibcgroup.git

python: compile systemd support by default

Compile systemd support file by default, there are two versions of
systemd functions available now, those get called based on the
--enable-systemd configuration, hence remove the #ifdef WITH_SYSTEMD
guards from bindings.

Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/src/python/cgroup.pxd.m4 b/src/python/cgroup.pxd.m4
index 78ed5934..e591876a 100644
--- a/src/python/cgroup.pxd.m4
+++ b/src/python/cgroup.pxd.m4
@@ -35,8 +35,6 @@ cdef extern from "libcgroup.h":
         unsigned int minor
         unsigned int release
 
-ifdef(`WITH_SYSTEMD',
-    # comment to appease m4
     cdef enum cgroup_systemd_mode_t:
         CGROUP_SYSTEMD_MODE_FAIL
         CGROUP_SYSTEMD_MODE_REPLACE
@@ -48,7 +46,6 @@ ifdef(`WITH_SYSTEMD',
         int delegated
         cgroup_systemd_mode_t mode
         pid_t pid
-)
 
     cdef enum cgroup_log_level:
         CGROUP_LOG_CONT
@@ -88,11 +85,8 @@ ifdef(`WITH_SYSTEMD',
 
     cg_setup_mode_t cgroup_setup_mode()
 
-ifdef(`WITH_SYSTEMD',
-    # comment to appease m4
     int cgroup_create_scope(const char * const scope_name, const char * const slice_name,
                             const cgroup_systemd_scope_opts * const opts)
-)
 
     int cgroup_get_cgroup(cgroup *cg)
 
@@ -113,15 +107,12 @@ ifdef(`WITH_SYSTEMD',
     void cgroup_set_permissions(cgroup *cgroup, mode_t control_dperm, mode_t control_fperm,
                            mode_t task_fperm)
 
-ifdef(`WITH_SYSTEMD',
-    # comment to appease m4
     int cgroup_create_scope2(cgroup *cgroup, int ignore_ownership,
                              const cgroup_systemd_scope_opts * const opts)
 
     int cgroup_set_default_systemd_cgroup()
     int cgroup_write_systemd_default_cgroup(const char * const slice_name,
                                             const char * const scope_name)
-)
 
     int cgroup_compare_cgroup(cgroup *cgroup_a, cgroup *cgroup_b)
 
diff --git a/src/python/libcgroup.pyx.m4 b/src/python/libcgroup.pyx.m4
index 295fc088..2f32fd90 100644
--- a/src/python/libcgroup.pyx.m4
+++ b/src/python/libcgroup.pyx.m4
@@ -33,14 +33,12 @@ cdef class Mode:
     CGROUP_MODE_HYBRID = cgroup.CGROUP_MODE_HYBRID
     CGROUP_MODE_UNIFIED = cgroup.CGROUP_MODE_UNIFIED
 
-ifdef(`WITH_SYSTEMD',
 cdef class SystemdMode:
     CGROUP_SYSTEMD_MODE_FAIL = cgroup.CGROUP_SYSTEMD_MODE_FAIL
     CGROUP_SYSTEMD_MODE_REPLACE = cgroup.CGROUP_SYSTEMD_MODE_REPLACE
     CGROUP_SYSTEMD_MODE_ISOLATE = cgroup.CGROUP_SYSTEMD_MODE_ISOLATE
     CGROUP_SYSTEMD_MODE_IGNORE_DEPS = cgroup.CGROUP_SYSTEMD_MODE_IGNORE_DEPS
     CGROUP_SYSTEMD_MODE_IGNORE_REQS = cgroup.CGROUP_SYSTEMD_MODE_IGNORE_REQS
-)
 
 cdef class LogLevel:
     CGROUP_LOG_CONT = cgroup.CGROUP_LOG_CONT
@@ -401,8 +399,6 @@ cdef class Cgroup:
         Cgroup.cgroup_init()
         return cgroup.cgroup_setup_mode()
 
-ifdef(`WITH_SYSTEMD',
-    # comment to appease m4
     @staticmethod
     def create_scope(scope_name='libcgroup.scope', slice_name='libcgroup.slice', delegated=True,
                      systemd_mode=SystemdMode.CGROUP_SYSTEMD_MODE_FAIL, pid=None):
@@ -439,8 +435,7 @@ ifdef(`WITH_SYSTEMD',
 
         ret = cgroup.cgroup_create_scope(c_str(scope_name), c_str(slice_name), &opts)
         if ret is not 0:
-            raise RuntimeError("cgroup_create_scope failed: {}".``format''(ret))
-)
+            raise RuntimeError("cgroup_create_scope failed: {}".`format'(ret))
 
     def get(self):
         """Get the cgroup information from the cgroup sysfs
@@ -539,8 +534,6 @@ ifdef(`WITH_SYSTEMD',
 
         cgroup.cgroup_set_permissions(self._cgp, dmode, cmode, tmode)
 
-ifdef(`WITH_SYSTEMD',
-    # comment to appease m4
     def create_scope2(self, ignore_ownership=True, delegated=True,
                       systemd_mode=SystemdMode.CGROUP_SYSTEMD_MODE_FAIL, pid=None):
         """Create a systemd scope using the cgroup instance
@@ -574,7 +567,7 @@ ifdef(`WITH_SYSTEMD',
 
         ret = cgroup.cgroup_create_scope2(self._cgp, ignore_ownership, &opts)
         if ret is not 0:
-            raise RuntimeError("cgroup_create_scope2 failed: {}".``format''(ret))
+            raise RuntimeError("cgroup_create_scope2 failed: {}".`format'(ret))
 
     @staticmethod
     def _set_default_systemd_cgroup():
@@ -646,7 +639,6 @@ ifdef(`WITH_SYSTEMD',
             Cgroup._set_default_systemd_cgroup()
         except RuntimeError:
             pass
-)
 
     cdef compare(self, Cgroup other):
         """Compare this cgroup instance with another cgroup instance