X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=unit.h;h=942de5f36f484950a150d5fb57aa16a3dbeb64ee;hb=f278026d21e2ded46f7f91152d60842525e74956;hp=3b7f6995ff7caa2e0899cb652e4ea03138e08d56;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6;p=elogind.git

diff --git a/unit.h b/unit.h
index 3b7f6995f..942de5f36 100644
--- a/unit.h
+++ b/unit.h
@@ -60,6 +60,7 @@ enum UnitLoadState {
         UNIT_STUB,
         UNIT_LOADED,
         UNIT_FAILED,
+        UNIT_MERGED,
         _UNIT_LOAD_STATE_MAX,
         _UNIT_LOAD_STATE_INVALID = -1
 };
@@ -112,11 +113,14 @@ enum UnitDependency {
 
 #include "manager.h"
 #include "job.h"
+#include "cgroup.h"
 
 struct Meta {
         Manager *manager;
+
         UnitType type;
         UnitLoadState load_state;
+        Unit *merged_into;
 
         char *id; /* One name is special because we use it for identification. Points to an entry in the names set */
 
@@ -124,13 +128,16 @@ struct Meta {
         Set *dependencies[_UNIT_DEPENDENCY_MAX];
 
         char *description;
-        char *load_path; /* if loaded from a config file this is the primary path to it */
+        char *fragment_path; /* if loaded from a config file this is the primary path to it */
 
         /* If there is something to do with this unit, then this is
          * the job for it */
         Job *job;
 
         bool in_load_queue:1;
+        bool in_dbus_queue:1;
+        bool in_cleanup_queue:1;
+        bool sent_dbus_new_signal:1;
 
         /* If we go down, pull down everything that depends on us, too */
         bool recursive_stop;
@@ -141,11 +148,20 @@ struct Meta {
         usec_t active_enter_timestamp;
         usec_t active_exit_timestamp;
 
+        /* Counterparts in the cgroup filesystem */
+        CGroupBonding *cgroup_bondings;
+
         /* Load queue */
         LIST_FIELDS(Meta, load_queue);
 
         /* Per type list */
         LIST_FIELDS(Meta, units_per_type);
+
+        /* D-Bus queue */
+        LIST_FIELDS(Meta, dbus_queue);
+
+        /* Cleanup queue */
+        LIST_FIELDS(Meta, cleanup_queue);
 };
 
 #include "service.h"
@@ -172,7 +188,7 @@ union Unit {
 struct UnitVTable {
         const char *suffix;
 
-        int (*init)(Unit *u);
+        int (*init)(Unit *u, UnitLoadState *new_state);
         void (*done)(Unit *u);
         int (*coldplug)(Unit *u);
 
@@ -192,6 +208,8 @@ struct UnitVTable {
         void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
         void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
 
+        void (*cgroup_notify_empty)(Unit *u);
+
         /* This is called for each unit type and should be used to
          * enumerate existing devices and load them. However,
          * everything that is loaded here should still stay in
@@ -238,20 +256,36 @@ void unit_free(Unit *u);
 int unit_add_name(Unit *u, const char *name);
 int unit_add_dependency(Unit *u, UnitDependency d, Unit *other);
 int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name);
+int unit_add_dependency_by_name_inverse(Unit *u, UnitDependency d, const char *name);
+
+int unit_add_exec_dependencies(Unit *u, ExecContext *c);
+
+int unit_add_cgroup(Unit *u, CGroupBonding *b);
+int unit_add_cgroup_from_text(Unit *u, const char *name);
+int unit_add_default_cgroup(Unit *u);
+CGroupBonding* unit_get_default_cgroup(Unit *u);
 
 int unit_choose_id(Unit *u, const char *name);
 int unit_set_description(Unit *u, const char *description);
 
 void unit_add_to_load_queue(Unit *u);
+void unit_add_to_dbus_queue(Unit *u);
+void unit_add_to_cleanup_queue(Unit *u);
 
 int unit_merge(Unit *u, Unit *other);
+int unit_merge_by_name(Unit *u, const char *other);
 
-int unit_load_fragment_and_dropin(Unit *u);
+Unit *unit_follow_merge(Unit *u);
+
+int unit_load_fragment_and_dropin(Unit *u, UnitLoadState *new_state);
+int unit_load_fragment_and_dropin_optional(Unit *u, UnitLoadState *new_state);
 int unit_load(Unit *unit);
 
 const char* unit_id(Unit *u);
 const char *unit_description(Unit *u);
 
+bool unit_has_name(Unit *u, const char *name);
+
 UnitActiveState unit_active_state(Unit *u);
 
 void unit_dump(Unit *u, FILE *f, const char *prefix);
@@ -276,10 +310,9 @@ void unit_unwatch_timer(Unit *u, Watch *w);
 
 bool unit_job_is_applicable(Unit *u, JobType j);
 
-const char *unit_path(void);
 int set_unit_path(const char *p);
 
-char *unit_name_escape_path(const char *prefix, const char *path, const char *suffix);
+char *unit_name_escape_path(const char *path, const char *suffix);
 
 const char *unit_type_to_string(UnitType i);
 UnitType unit_type_from_string(const char *s);