X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fcgroup.h;h=3bcf6868137b3bb07d2143753fe4a7ab439454e9;hp=767eea2fb5aec2509ad71aa1b41ff66f82c6e145;hb=e916c1378b697b1f267d021a823bbfcb5ac8376c;hpb=56c4f5eceb1e77ac537960e255076712fcd0e7e5 diff --git a/src/core/cgroup.h b/src/core/cgroup.h index 767eea2fb..3bcf68681 100644 --- a/src/core/cgroup.h +++ b/src/core/cgroup.h @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - #pragma once /*** @@ -23,12 +21,15 @@ #include -#include "list.h" -#include "time-util.h" -#include "logind.h" +//#include "list.h" +//#include "time-util.h" +#include "cgroup-util.h" +#if 0 /// UNNEEDED by elogind typedef struct CGroupContext CGroupContext; typedef struct CGroupDeviceAllow CGroupDeviceAllow; +typedef struct CGroupIODeviceWeight CGroupIODeviceWeight; +typedef struct CGroupIODeviceLimit CGroupIODeviceLimit; typedef struct CGroupBlockIODeviceWeight CGroupBlockIODeviceWeight; typedef struct CGroupBlockIODeviceBandwidth CGroupBlockIODeviceBandwidth; @@ -56,30 +57,58 @@ struct CGroupDeviceAllow { bool m:1; }; +struct CGroupIODeviceWeight { + LIST_FIELDS(CGroupIODeviceWeight, device_weights); + char *path; + uint64_t weight; +}; + +struct CGroupIODeviceLimit { + LIST_FIELDS(CGroupIODeviceLimit, device_limits); + char *path; + uint64_t limits[_CGROUP_IO_LIMIT_TYPE_MAX]; +}; + struct CGroupBlockIODeviceWeight { LIST_FIELDS(CGroupBlockIODeviceWeight, device_weights); char *path; - unsigned long weight; + uint64_t weight; }; struct CGroupBlockIODeviceBandwidth { LIST_FIELDS(CGroupBlockIODeviceBandwidth, device_bandwidths); char *path; - uint64_t bandwidth; - bool read; + uint64_t rbps; + uint64_t wbps; }; struct CGroupContext { bool cpu_accounting; + bool io_accounting; bool blockio_accounting; bool memory_accounting; + bool tasks_accounting; - unsigned long cpu_shares; - unsigned long startup_cpu_shares; + /* For unified hierarchy */ + uint64_t cpu_weight; + uint64_t startup_cpu_weight; usec_t cpu_quota_per_sec_usec; - unsigned long blockio_weight; - unsigned long startup_blockio_weight; + uint64_t io_weight; + uint64_t startup_io_weight; + LIST_HEAD(CGroupIODeviceWeight, io_device_weights); + LIST_HEAD(CGroupIODeviceLimit, io_device_limits); + + uint64_t memory_low; + uint64_t memory_high; + uint64_t memory_max; + + /* For legacy hierarchies */ + uint64_t cpu_shares; + uint64_t startup_cpu_shares; + + uint64_t blockio_weight; + uint64_t startup_blockio_weight; LIST_HEAD(CGroupBlockIODeviceWeight, blockio_device_weights); LIST_HEAD(CGroupBlockIODeviceBandwidth, blockio_device_bandwidths); @@ -88,63 +117,78 @@ struct CGroupContext { CGroupDevicePolicy device_policy; LIST_HEAD(CGroupDeviceAllow, device_allow); + /* Common */ + uint64_t tasks_max; + bool delegate; }; -// #include "unit.h" -#include "cgroup-util.h" +#include "unit.h" void cgroup_context_init(CGroupContext *c); void cgroup_context_done(CGroupContext *c); -// 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); +void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix); CGroupMask cgroup_context_get_mask(CGroupContext *c); void cgroup_context_free_device_allow(CGroupContext *c, CGroupDeviceAllow *a); +void cgroup_context_free_io_device_weight(CGroupContext *c, CGroupIODeviceWeight *w); +void cgroup_context_free_io_device_limit(CGroupContext *c, CGroupIODeviceLimit *l); void cgroup_context_free_blockio_device_weight(CGroupContext *c, CGroupBlockIODeviceWeight *w); void cgroup_context_free_blockio_device_bandwidth(CGroupContext *c, CGroupBlockIODeviceBandwidth *b); -// 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); +CGroupMask unit_get_own_mask(Unit *u); +CGroupMask unit_get_siblings_mask(Unit *u); +CGroupMask unit_get_members_mask(Unit *u); +CGroupMask unit_get_subtree_mask(Unit *u); -// UNNEEDED vCGroupMask unit_get_target_mask(Unit *u); -// UNNEEDED CGroupMask unit_get_enable_mask(Unit *u); +CGroupMask unit_get_target_mask(Unit *u); +CGroupMask unit_get_enable_mask(Unit *u); -// UNNEEDED void unit_update_cgroup_members_masks(Unit *u); +void unit_update_cgroup_members_masks(Unit *u); -// UNNEEDED har *unit_default_cgroup_path(Unit *u); -// UNNEEDED int unit_set_cgroup_path(Unit *u, const char *path); +char *unit_default_cgroup_path(Unit *u); +int unit_set_cgroup_path(Unit *u, const char *path); -// 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); +int unit_realize_cgroup(Unit *u); +void unit_release_cgroup(Unit *u); +void unit_prune_cgroup(Unit *u); +int unit_watch_cgroup(Unit *u); -// UNNEEDED int unit_attach_pids_to_cgroup(Unit *u); +int unit_attach_pids_to_cgroup(Unit *u); +#else +# include "logind.h" +#endif // 0 int manager_setup_cgroup(Manager *m); void manager_shutdown_cgroup(Manager *m, bool delete); -// UNNEEDED unsigned manager_dispatch_cgroup_queue(Manager *m); +#if 0 /// UNNEEDED by elogind +unsigned manager_dispatch_cgroup_queue(Manager *m); + +Unit *manager_get_unit_by_cgroup(Manager *m, const char *cgroup); +Unit *manager_get_unit_by_pid_cgroup(Manager *m, pid_t pid); +Unit* manager_get_unit_by_pid(Manager *m, pid_t pid); + +int unit_search_main_pid(Unit *u, pid_t *ret); +int unit_watch_all_pids(Unit *u); -// 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); +int unit_get_memory_current(Unit *u, uint64_t *ret); +int unit_get_tasks_current(Unit *u, uint64_t *ret); +int unit_get_cpu_usage(Unit *u, nsec_t *ret); +int unit_reset_cpu_usage(Unit *u); -// UNNEEDED int unit_search_main_pid(Unit *u, pid_t *ret); -// UNNEEDED int unit_watch_all_pids(Unit *u); +bool unit_cgroup_delegate(Unit *u); -// 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); +int unit_notify_cgroup_empty(Unit *u); +#endif // 0 +int manager_notify_cgroup_empty(Manager *m, const char *group); -// UNNEEDED bool unit_cgroup_delegate(Unit *u); +#if 0 /// UNNEEDED by elogind +void unit_invalidate_cgroup(Unit *u, CGroupMask m); -// UNNEEDED int unit_notify_cgroup_empty(Unit *u); -// UNNEEDED int manager_notify_cgroup_empty(Manager *m, const char *group); +void manager_invalidate_startup_units(Manager *m); const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_; CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_; +#endif // 0