X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.h;h=767eea2fb5aec2509ad71aa1b41ff66f82c6e145;hb=56c4f5eceb1e77ac537960e255076712fcd0e7e5;hp=6555d89e37fe64430059598f2273f10aa577f8e2;hpb=44a6b1b68029833893f6e9cee35aa27a974038f6;p=elogind.git

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 6555d89e3..767eea2fb 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -5,7 +5,7 @@
 /***
   This file is part of systemd.
 
-  Copyright 2010 Lennart Poettering
+  Copyright 2013 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
@@ -21,74 +21,130 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-typedef struct CGroupBonding CGroupBonding;
+#include <stdbool.h>
 
-#include "unit.h"
+#include "list.h"
+#include "time-util.h"
+#include "logind.h"
 
-/* Binds a cgroup to a name */
-struct CGroupBonding {
-        char *controller;
-        char *path;
+typedef struct CGroupContext CGroupContext;
+typedef struct CGroupDeviceAllow CGroupDeviceAllow;
+typedef struct CGroupBlockIODeviceWeight CGroupBlockIODeviceWeight;
+typedef struct CGroupBlockIODeviceBandwidth CGroupBlockIODeviceBandwidth;
 
-        Unit *unit;
+typedef enum CGroupDevicePolicy {
 
-        /* For the Unit::cgroup_bondings list */
-        LIST_FIELDS(CGroupBonding, by_unit);
+        /* When devices listed, will allow those, plus built-in ones,
+        if none are listed will allow everything. */
+        CGROUP_AUTO,
 
-        /* For the Manager::cgroup_bondings hashmap */
-        LIST_FIELDS(CGroupBonding, by_path);
+        /* Everything forbidden, except built-in ones and listed ones. */
+        CGROUP_CLOSED,
 
-        /* When shutting down, remove cgroup? Are our own tasks the
-         * only ones in this group?*/
-        bool ours:1;
+        /* Everythings forbidden, except for the listed devices */
+        CGROUP_STRICT,
 
-        /* If we cannot create this group, or add a process to it, is this fatal? */
-        bool essential:1;
+        _CGROUP_DEVICE_POLICY_MAX,
+        _CGROUP_DEVICE_POLICY_INVALID = -1
+} CGroupDevicePolicy;
 
-        /* This cgroup is realized */
-        bool realized:1;
+struct CGroupDeviceAllow {
+        LIST_FIELDS(CGroupDeviceAllow, device_allow);
+        char *path;
+        bool r:1;
+        bool w:1;
+        bool m:1;
 };
 
-int cgroup_bonding_realize(CGroupBonding *b);
-int cgroup_bonding_realize_list(CGroupBonding *first);
+struct CGroupBlockIODeviceWeight {
+        LIST_FIELDS(CGroupBlockIODeviceWeight, device_weights);
+        char *path;
+        unsigned long weight;
+};
 
-void cgroup_bonding_free(CGroupBonding *b, bool trim);
-void cgroup_bonding_free_list(CGroupBonding *first, bool trim);
+struct CGroupBlockIODeviceBandwidth {
+        LIST_FIELDS(CGroupBlockIODeviceBandwidth, device_bandwidths);
+        char *path;
+        uint64_t bandwidth;
+        bool read;
+};
+
+struct CGroupContext {
+        bool cpu_accounting;
+        bool blockio_accounting;
+        bool memory_accounting;
 
-int cgroup_bonding_install(CGroupBonding *b, pid_t pid, const char *suffix);
-int cgroup_bonding_install_list(CGroupBonding *first, pid_t pid, const char *suffix);
+        unsigned long cpu_shares;
+        unsigned long startup_cpu_shares;
+        usec_t cpu_quota_per_sec_usec;
 
-int cgroup_bonding_migrate(CGroupBonding *b, CGroupBonding *list);
-int cgroup_bonding_migrate_to(CGroupBonding *b, const char *target, bool rem);
+        unsigned long blockio_weight;
+        unsigned long startup_blockio_weight;
+        LIST_HEAD(CGroupBlockIODeviceWeight, blockio_device_weights);
+        LIST_HEAD(CGroupBlockIODeviceBandwidth, blockio_device_bandwidths);
 
-int cgroup_bonding_set_group_access(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid);
-int cgroup_bonding_set_group_access_list(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid);
+        uint64_t memory_limit;
 
-int cgroup_bonding_set_task_access(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid, int sticky);
-int cgroup_bonding_set_task_access_list(CGroupBonding *b, mode_t mode, uid_t uid, gid_t gid, int sticky);
+        CGroupDevicePolicy device_policy;
+        LIST_HEAD(CGroupDeviceAllow, device_allow);
+
+        bool delegate;
+};
 
-int cgroup_bonding_kill(CGroupBonding *b, int sig, bool sigcont, bool rem, Set *s, const char *suffix);
-int cgroup_bonding_kill_list(CGroupBonding *first, int sig, bool sigcont, bool rem, Set *s, const char *suffix);
+// #include "unit.h"
+#include "cgroup-util.h"
 
-void cgroup_bonding_trim(CGroupBonding *first, bool delete_root);
-void cgroup_bonding_trim_list(CGroupBonding *first, bool delete_root);
+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);
 
-int cgroup_bonding_is_empty(CGroupBonding *b);
-int cgroup_bonding_is_empty_list(CGroupBonding *first);
+CGroupMask cgroup_context_get_mask(CGroupContext *c);
 
-CGroupBonding *cgroup_bonding_find_list(CGroupBonding *first, const char *controller) _pure_;
+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);
 
-char *cgroup_bonding_to_string(CGroupBonding *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);
 
-pid_t cgroup_bonding_search_main_pid(CGroupBonding *b);
-pid_t cgroup_bonding_search_main_pid_list(CGroupBonding *b);
+// UNNEEDED vCGroupMask unit_get_target_mask(Unit *u);
+// UNNEEDED CGroupMask unit_get_enable_mask(Unit *u);
 
-#include "manager.h"
+// 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);
 
 int manager_setup_cgroup(Manager *m);
 void manager_shutdown_cgroup(Manager *m, bool delete);
 
-int cgroup_bonding_get(Manager *m, const char *cgroup, CGroupBonding **bonding);
-int cgroup_notify_empty(Manager *m, const char *group);
+// 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_cpu_usage(Unit *u, nsec_t *ret);
+// UNNEEDED int unit_reset_cpu_usage(Unit *u);
+
+// UNNEEDED 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);
 
-Unit* cgroup_unit_by_pid(Manager *m, pid_t pid);
+const char* cgroup_device_policy_to_string(CGroupDevicePolicy i) _const_;
+CGroupDevicePolicy cgroup_device_policy_from_string(const char *s) _pure_;