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=29782c58cc142bdf7831377d2f9540f3c401e734;hb=e916c1378b697b1f267d021a823bbfcb5ac8376c;hpb=fdff7397c22a853e7e66ec72adb85c3f2f519f32;ds=sidebyside diff --git a/src/core/cgroup.h b/src/core/cgroup.h index 29782c58c..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,27 +21,18 @@ #include -// #include "list.h" -// #include "time-util.h" -#include "logind.h" - -// UNNEEDED typedef struct CGroupContext CGroupContext; -// UNNEEDED Stypedef struct CGroupDeviceAllow CGroupDeviceAllow; -// UNNEEDED typedef struct CGroupBlockIODeviceWeight CGroupBlockIODeviceWeight; -// UNNEEDED typedef struct CGroupBlockIODeviceBandwidth CGroupBlockIODeviceBandwidth; - -/* Maximum value for fixed (manual) net class ID assignment, - * and also the value at which the range of automatic assignments starts - */ -// UNNEEDED #define CGROUP_NETCLASS_FIXED_MAX UINT32_C(65535) +//#include "list.h" +//#include "time-util.h" +#include "cgroup-util.h" -// UNNEEDED typedef struct CGroupContext CGroupContext; -// UNNEEDED typedef struct CGroupDeviceAllow CGroupDeviceAllow; -// UNNEEDED typedef struct CGroupBlockIODeviceWeight CGroupBlockIODeviceWeight; -// UNNEEDED typedef struct CGroupBlockIODeviceBandwidth CGroupBlockIODeviceBandwidth; +#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; -/// UNNEEDED by elogind -#if 0 typedef enum CGroupDevicePolicy { /* When devices listed, will allow those, plus built-in ones, @@ -60,17 +49,6 @@ typedef enum CGroupDevicePolicy { _CGROUP_DEVICE_POLICY_INVALID = -1 } CGroupDevicePolicy; -typedef enum CGroupNetClassType { - /* Default - do not assign a net class */ - CGROUP_NETCLASS_TYPE_NONE, - - /* Automatically assign a net class */ - CGROUP_NETCLASS_TYPE_AUTO, - - /* Assign the net class that was provided by the user */ - CGROUP_NETCLASS_TYPE_FIXED, -} CGroupNetClassType; - struct CGroupDeviceAllow { LIST_FIELDS(CGroupDeviceAllow, device_allow); char *path; @@ -79,6 +57,18 @@ 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; @@ -88,18 +78,34 @@ struct CGroupBlockIODeviceWeight { 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; + + /* 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); + 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; - usec_t cpu_quota_per_sec_usec; uint64_t blockio_weight; uint64_t startup_blockio_weight; @@ -111,77 +117,78 @@ struct CGroupContext { CGroupDevicePolicy device_policy; LIST_HEAD(CGroupDeviceAllow, device_allow); - CGroupNetClassType netclass_type; - uint32_t netclass_id; - + /* Common */ uint64_t tasks_max; bool delegate; }; -#endif // 0 - -// #include "unit.h" -// #include "cgroup-util.h" -// UNNNEEDE void cgroup_context_init(CGroupContext *c); -// UNNEEDED 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); +#include "unit.h" -// UNNEEDED CGroupMask cgroup_context_get_mask(CGroupContext *c); +void cgroup_context_init(CGroupContext *c); +void cgroup_context_done(CGroupContext *c); +void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix); -// UNNEEDED void cgroup_context_free_device_allow(CGroupContext *c, CGroupDeviceAllow *a); -// UNNEEDED void cgroup_context_free_blockio_device_weight(CGroupContext *c, CGroupBlockIODeviceWeight *w); -// UNNEEDED void cgroup_context_free_blockio_device_bandwidth(CGroupContext *c, CGroupBlockIODeviceBandwidth *b); +CGroupMask cgroup_context_get_mask(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); +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 vCGroupMask unit_get_target_mask(Unit *u); -// UNNEEDED CGroupMask unit_get_enable_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 void unit_update_cgroup_members_masks(Unit *u); +CGroupMask unit_get_target_mask(Unit *u); +CGroupMask unit_get_enable_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); -// 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); +char *unit_default_cgroup_path(Unit *u); +int unit_set_cgroup_path(Unit *u, const char *path); -// UNNEEDED int unit_attach_pids_to_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_add_to_netclass_cgroup(Unit *u); -// UNNEEDED int unit_remove_from_netclass_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); -// 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); +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); -// UNNEEDED int unit_search_main_pid(Unit *u, pid_t *ret); -// UNNEEDED int unit_watch_all_pids(Unit *u); +int unit_search_main_pid(Unit *u, pid_t *ret); +int unit_watch_all_pids(Unit *u); -// UNNEEDED int unit_get_memory_current(Unit *u, uint64_t *ret); -// UNNEEDED int unit_get_tasks_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_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 bool unit_cgroup_delegate(Unit *u); +bool unit_cgroup_delegate(Unit *u); -// UNNEEDED int unit_notify_cgroup_empty(Unit *u); -// UNNEEDED int manager_notify_cgroup_empty(Manager *m, const char *group); +int unit_notify_cgroup_empty(Unit *u); +#endif // 0 +int manager_notify_cgroup_empty(Manager *m, const char *group); -// UNNEEDED void unit_invalidate_cgroup(Unit *u, CGroupMask m); +#if 0 /// UNNEEDED by elogind +void unit_invalidate_cgroup(Unit *u, CGroupMask m); -// UNNEEDED void manager_invalidate_startup_units(Manager *m); +void manager_invalidate_startup_units(Manager *m); -// UNNEEDED const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_; -// UNNEEDED CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_; +const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_; +CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_; +#endif // 0