X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.h;h=767eea2fb5aec2509ad71aa1b41ff66f82c6e145;hb=bf2098e9e4837573d84dd4949b9c28a7372c93b9;hp=2b19add7991e856d9574422b890ee8cf618cfa8e;hpb=b2f8b02ec27dfec9cbd23573f47aba494f2e9b5f;p=elogind.git
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 2b19add79..767eea2fb 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -21,7 +21,11 @@
along with systemd; If not, see .
***/
+#include
+
#include "list.h"
+#include "time-util.h"
+#include "logind.h"
typedef struct CGroupContext CGroupContext;
typedef struct CGroupDeviceAllow CGroupDeviceAllow;
@@ -71,11 +75,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,46 +87,64 @@ struct CGroupContext {
CGroupDevicePolicy device_policy;
LIST_HEAD(CGroupDeviceAllow, device_allow);
+
+ bool delegate;
};
-#include "unit.h"
-#include "manager.h"
+// #include "unit.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);
+// UNNEEDED void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix);
+// UNNEEDED void cgroup_context_apply(CGroupContext *c, CGroupMask mask, const char *path, ManagerState state);
-CGroupControllerMask cgroup_context_get_mask(CGroupContext *c);
+CGroupMask 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);
-usec_t cgroup_context_get_cpu_quota_usec(CGroupContext *c);
-usec_t cgroup_context_get_cpu_quota_per_sec_usec(CGroupContext *c);
+// UNNEEDED CGroupMask unit_get_own_mask(Unit *u);
+// UNNEEDED CGroupMask unit_get_siblings_mask(Unit *u);
+// UNNEEDED CGroupMask unit_get_members_mask(Unit *u);
+// UNNEEDED CGroupMask unit_get_subtree_mask(Unit *u);
+
+// UNNEEDED vCGroupMask unit_get_target_mask(Unit *u);
+// UNNEEDED CGroupMask unit_get_enable_mask(Unit *u);
+
+// UNNEEDED void unit_update_cgroup_members_masks(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);
+// UNNEEDED har *unit_default_cgroup_path(Unit *u);
+// UNNEEDED int unit_set_cgroup_path(Unit *u, const char *path);
-void unit_update_cgroup_members_masks(Unit *u);
-int unit_realize_cgroup(Unit *u);
-void unit_destroy_cgroup(Unit *u);
+// UNNEEDED int unit_realize_cgroup(Unit *u);
+// UNNEEDED void unit_release_cgroup(Unit *u);
+// UNNEEDED void unit_prune_cgroup(Unit *u);
+// UNNEEDED int unit_watch_cgroup(Unit *u);
+
+// UNNEEDED int unit_attach_pids_to_cgroup(Unit *u);
int manager_setup_cgroup(Manager *m);
void manager_shutdown_cgroup(Manager *m, bool delete);
-unsigned manager_dispatch_cgroup_queue(Manager *m);
+// UNNEEDED unsigned manager_dispatch_cgroup_queue(Manager *m);
+
+// UNNEEDED Unit *manager_get_unit_by_cgroup(Manager *m, const char *cgroup);
+// UNNEEDED Unit *manager_get_unit_by_pid_cgroup(Manager *m, pid_t pid);
+// UNNEEDED Unit* manager_get_unit_by_pid(Manager *m, pid_t pid);
+
+// UNNEEDED int unit_search_main_pid(Unit *u, pid_t *ret);
+// UNNEEDED int unit_watch_all_pids(Unit *u);
-Unit *manager_get_unit_by_cgroup(Manager *m, const char *cgroup);
-Unit* manager_get_unit_by_pid(Manager *m, pid_t pid);
+// UNNEEDED int unit_get_memory_current(Unit *u, uint64_t *ret);
+// UNNEEDED int unit_get_cpu_usage(Unit *u, nsec_t *ret);
+// UNNEEDED int unit_reset_cpu_usage(Unit *u);
-pid_t unit_search_main_pid(Unit *u);
+// UNNEEDED bool unit_cgroup_delegate(Unit *u);
-int manager_notify_cgroup_empty(Manager *m, const char *group);
+// UNNEEDED int unit_notify_cgroup_empty(Unit *u);
+// UNNEEDED int manager_notify_cgroup_empty(Manager *m, const char *group);
const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_;
CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_;