pid1: add ./configure switch to select default cgroup hierarchy

[elogind.git] / src / core / cgroup.h

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 68cb65007aba418bbfb7d9a1e913e9a578daa774..dd8e436b969f45b91561893f702daa3ccd039f88 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -90,6 +90,10 @@ struct CGroupContext {
         bool tasks_accounting;
 
         /* For unified hierarchy */
+        uint64_t cpu_weight;
+        uint64_t startup_cpu_weight;
+        usec_t cpu_quota_per_sec_usec;
+
         uint64_t io_weight;
         uint64_t startup_io_weight;
         LIST_HEAD(CGroupIODeviceWeight, io_device_weights);
@@ -98,11 +102,11 @@ struct CGroupContext {
         uint64_t memory_low;
         uint64_t memory_high;
         uint64_t memory_max;
+        uint64_t memory_swap_max;
 
         /* For legacy hierarchies */
         uint64_t cpu_shares;
         uint64_t startup_cpu_shares;
-        usec_t cpu_quota_per_sec_usec;
 
         uint64_t blockio_weight;
         uint64_t startup_blockio_weight;
@@ -120,13 +124,11 @@ struct CGroupContext {
         bool delegate;
 };
 
-#include "cgroup-util.h"
 #include "unit.h"
 
 void cgroup_context_init(CGroupContext *c);
 void cgroup_context_done(CGroupContext *c);
 void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix);
-void cgroup_context_apply(CGroupContext *c, CGroupMask mask, const char *path, ManagerState state);
 
 CGroupMask cgroup_context_get_mask(CGroupContext *c);
 
@@ -157,7 +159,6 @@ int unit_watch_cgroup(Unit *u);
 int unit_attach_pids_to_cgroup(Unit *u);
 #else
 # include "logind.h"
-# define MANAGER_IS_SYSTEM(m) (1)
 #endif // 0
 
 int manager_setup_cgroup(Manager *m);
@@ -181,8 +182,10 @@ int unit_reset_cpu_usage(Unit *u);
 bool unit_cgroup_delegate(Unit *u);
 
 int unit_notify_cgroup_empty(Unit *u);
+#endif // 0
 int manager_notify_cgroup_empty(Manager *m, const char *group);
 
+#if 0 /// UNNEEDED by elogind
 void unit_invalidate_cgroup(Unit *u, CGroupMask m);
 
 void manager_invalidate_startup_units(Manager *m);