core: rename unit_destroy_cgroup() to unit_destroy_cgroup_if_empty() since it's not...

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

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 2b19add7991e856d9574422b890ee8cf618cfa8e..16d661357b216e962b85afb7bdbd664d16ac6340 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -71,11 +71,11 @@ struct CGroupContext {
         bool memory_accounting;
 
         unsigned long cpu_shares;
+        unsigned long startup_cpu_shares;
         usec_t cpu_quota_per_sec_usec;
-        usec_t cpu_quota_usec;
-        usec_t cpu_quota_period_usec;
 
         unsigned long blockio_weight;
+        unsigned long startup_blockio_weight;
         LIST_HEAD(CGroupBlockIODeviceWeight, blockio_device_weights);
         LIST_HEAD(CGroupBlockIODeviceBandwidth, blockio_device_bandwidths);
 
@@ -83,6 +83,8 @@ struct CGroupContext {
 
         CGroupDevicePolicy device_policy;
         LIST_HEAD(CGroupDeviceAllow, device_allow);
+
+        bool delegate;
 };
 
 #include "unit.h"
@@ -92,7 +94,7 @@ struct CGroupContext {
 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, CGroupControllerMask mask, const char *path);
+void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const char *path, ManagerState state);
 
 CGroupControllerMask cgroup_context_get_mask(CGroupContext *c);
 
@@ -100,9 +102,6 @@ void cgroup_context_free_device_allow(CGroupContext *c, CGroupDeviceAllow *a);
 void cgroup_context_free_blockio_device_weight(CGroupContext *c, CGroupBlockIODeviceWeight *w);
 void cgroup_context_free_blockio_device_bandwidth(CGroupContext *c, CGroupBlockIODeviceBandwidth *b);
 
-usec_t cgroup_context_get_cpu_quota_usec(CGroupContext *c);
-usec_t cgroup_context_get_cpu_quota_per_sec_usec(CGroupContext *c);
-
 CGroupControllerMask unit_get_cgroup_mask(Unit *u);
 CGroupControllerMask unit_get_siblings_mask(Unit *u);
 CGroupControllerMask unit_get_members_mask(Unit *u);
@@ -110,7 +109,7 @@ CGroupControllerMask unit_get_target_mask(Unit *u);
 
 void unit_update_cgroup_members_masks(Unit *u);
 int unit_realize_cgroup(Unit *u);
-void unit_destroy_cgroup(Unit *u);
+void unit_destroy_cgroup_if_empty(Unit *u);
 
 int manager_setup_cgroup(Manager *m);
 void manager_shutdown_cgroup(Manager *m, bool delete);