X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.h;h=993aa9db7d6c7f7341ba4a1acb108a7138dbcfea;hb=5bd4b173605142c7be493aa4d958ebaef21f421d;hp=96f1d9f7b6217a1601a29996884b14ff98a22145;hpb=4ad490007b70e6ac18d3cb04fa2ed92eba1451fa;p=elogind.git

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 96f1d9f7b..993aa9db7 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -21,7 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
 #include "list.h"
+#include "time-util.h"
 
 typedef struct CGroupContext CGroupContext;
 typedef struct CGroupDeviceAllow CGroupDeviceAllow;
@@ -71,34 +74,45 @@ struct CGroupContext {
         bool memory_accounting;
 
         unsigned long cpu_shares;
+        unsigned long startup_cpu_shares;
+        usec_t cpu_quota_per_sec_usec;
 
         unsigned long blockio_weight;
+        unsigned long startup_blockio_weight;
         LIST_HEAD(CGroupBlockIODeviceWeight, blockio_device_weights);
         LIST_HEAD(CGroupBlockIODeviceBandwidth, blockio_device_bandwidths);
 
         uint64_t memory_limit;
-        uint64_t memory_soft_limit;
 
         CGroupDevicePolicy device_policy;
         LIST_HEAD(CGroupDeviceAllow, device_allow);
+
+        bool delegate;
 };
 
 #include "unit.h"
-#include "manager.h"
 #include "cgroup-util.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, 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);
 
 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);
 
-void unit_realize_cgroup(Unit *u);
-void unit_destroy_cgroup(Unit *u);
+CGroupControllerMask unit_get_cgroup_mask(Unit *u);
+CGroupControllerMask unit_get_siblings_mask(Unit *u);
+CGroupControllerMask unit_get_members_mask(Unit *u);
+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_if_empty(Unit *u);
+int unit_attach_pids_to_cgroup(Unit *u);
 
 int manager_setup_cgroup(Manager *m);
 void manager_shutdown_cgroup(Manager *m, bool delete);