X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.h;h=1957f2d83a4e0c90525ed8445ac7e147be0a927f;hb=076d998b73bf53e6652ea3ae4bed169e57423741;hp=be882a0b6c273f066f50ecae89733042ae66f669;hpb=3b22396a4b2767a98172f6915929c47738cb0a1e;p=elogind.git diff --git a/src/core/cgroup.h b/src/core/cgroup.h index be882a0b6..1957f2d83 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 /*** @@ -27,13 +25,22 @@ // #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; +#if 0 /// UNNEEDED by elogind +typedef struct CGroupContext CGroupContext; +Stypedef struct CGroupDeviceAllow CGroupDeviceAllow; +typedef struct CGroupBlockIODeviceWeight CGroupBlockIODeviceWeight; +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 + */ +#define CGROUP_NETCLASS_FIXED_MAX UINT32_C(65535) + +typedef struct CGroupContext CGroupContext; +typedef struct CGroupDeviceAllow CGroupDeviceAllow; +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, @@ -50,6 +57,17 @@ 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; @@ -61,7 +79,7 @@ struct CGroupDeviceAllow { struct CGroupBlockIODeviceWeight { LIST_FIELDS(CGroupBlockIODeviceWeight, device_weights); char *path; - unsigned long weight; + uint64_t weight; }; struct CGroupBlockIODeviceBandwidth { @@ -75,13 +93,14 @@ struct CGroupContext { bool cpu_accounting; bool blockio_accounting; bool memory_accounting; + bool tasks_accounting; - unsigned long cpu_shares; - unsigned long startup_cpu_shares; + uint64_t cpu_shares; + uint64_t startup_cpu_shares; usec_t cpu_quota_per_sec_usec; - unsigned long blockio_weight; - unsigned long startup_blockio_weight; + uint64_t blockio_weight; + uint64_t startup_blockio_weight; LIST_HEAD(CGroupBlockIODeviceWeight, blockio_device_weights); LIST_HEAD(CGroupBlockIODeviceBandwidth, blockio_device_bandwidths); @@ -90,64 +109,79 @@ struct CGroupContext { CGroupDevicePolicy device_policy; LIST_HEAD(CGroupDeviceAllow, device_allow); + CGroupNetClassType netclass_type; + uint32_t netclass_id; + + uint64_t tasks_max; + bool delegate; }; -#endif // 0 -// #include "unit.h" -// #include "cgroup-util.h" +#include "cgroup-util.h" +#include "unit.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); +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, CGroupMask mask, const char *path, uint32_t netclass_id, ManagerState state); -// UNNEEDED CGroupMask cgroup_context_get_mask(CGroupContext *c); +CGroupMask cgroup_context_get_mask(CGroupContext *c); -// 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); +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); -// 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); +vCGroupMask 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); +har *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); + +int unit_add_to_netclass_cgroup(Unit *u); +int unit_remove_from_netclass_cgroup(Unit *u); +#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_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); +int manager_notify_cgroup_empty(Manager *m, const char *group); -// UNNEEDED const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_; -// UNNEEDED CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_; +void unit_invalidate_cgroup(Unit *u, CGroupMask m); + +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