Prep v228: Add remaining updates from upstream (3/3)

[elogind.git] / src / core / cgroup.h

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 64d3ac64f58409822ffc42a527ce380d06219e76..6bef26c481ee04e6f4da50c7d6572ec6255acc6a 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -21,13 +21,29 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "list.h"
+#include <stdbool.h>
 
-typedef struct CGroupContext CGroupContext;
-typedef struct CGroupDeviceAllow CGroupDeviceAllow;
-typedef struct CGroupBlockIODeviceWeight CGroupBlockIODeviceWeight;
-typedef struct CGroupBlockIODeviceBandwidth CGroupBlockIODeviceBandwidth;
+// #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)
+
+// UNNEEDED typedef struct CGroupContext CGroupContext;
+// UNNEEDED typedef struct CGroupDeviceAllow CGroupDeviceAllow;
+// UNNEEDED typedef struct CGroupBlockIODeviceWeight CGroupBlockIODeviceWeight;
+// UNNEEDED typedef struct CGroupBlockIODeviceBandwidth CGroupBlockIODeviceBandwidth;
+
+/// UNNEEDED by elogind
+#if 0
 typedef enum CGroupDevicePolicy {
 
         /* When devices listed, will allow those, plus built-in ones,
@@ -44,6 +60,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;
@@ -55,7 +82,7 @@ struct CGroupDeviceAllow {
 struct CGroupBlockIODeviceWeight {
         LIST_FIELDS(CGroupBlockIODeviceWeight, device_weights);
         char *path;
-        unsigned long weight;
+        uint64_t weight;
 };
 
 struct CGroupBlockIODeviceBandwidth {
@@ -69,17 +96,14 @@ struct CGroupContext {
         bool cpu_accounting;
         bool blockio_accounting;
         bool memory_accounting;
+        bool tasks_accounting;
 
-        unsigned long cpu_shares;
-        unsigned long startup_cpu_shares;
-        bool startup_cpu_shares_set:1;
+        uint64_t cpu_shares;
+        uint64_t 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;
-        bool startup_blockio_weight_set:1;
+        uint64_t blockio_weight;
+        uint64_t startup_blockio_weight;
         LIST_HEAD(CGroupBlockIODeviceWeight, blockio_device_weights);
         LIST_HEAD(CGroupBlockIODeviceBandwidth, blockio_device_bandwidths);
 
@@ -87,46 +111,78 @@ 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 "manager.h"
-#include "cgroup-util.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(Manager *m, CGroupContext *c, CGroupControllerMask mask, const char *path);
+// 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, uint32_t netclass_id, ManagerState state);
 
-CGroupControllerMask cgroup_context_get_mask(Manager *m, CGroupContext *c);
+// UNNEEDED 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);
+// 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);
 
-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);
 
-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 vCGroupMask unit_get_target_mask(Unit *u);
+// UNNEEDED CGroupMask unit_get_enable_mask(Unit *u);
 
-void unit_update_cgroup_members_masks(Unit *u);
-int unit_realize_cgroup(Unit *u);
-void unit_destroy_cgroup(Unit *u);
+// UNNEEDED 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);
+
+// 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);
+
+// UNNEEDED int unit_add_to_netclass_cgroup(Unit *u);
+// UNNEEDED int unit_remove_from_netclass_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);
+
+// 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);
+
+// UNNEEDED bool unit_cgroup_delegate(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_notify_cgroup_empty(Unit *u);
+// UNNEEDED int manager_notify_cgroup_empty(Manager *m, const char *group);
 
-pid_t unit_search_main_pid(Unit *u);
+// UNNEEDED void unit_invalidate_cgroup(Unit *u, CGroupMask m);
 
-int manager_notify_cgroup_empty(Manager *m, const char *group);
+// UNNEEDED 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_;
+// UNNEEDED const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_;
+// UNNEEDED CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_;