X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=unit.h;h=2433cc7d7cf7e1ca6afcf436d63e898a6e2f358c;hb=9eba9da4bce4778b4d5dd43e2c41756976a1582b;hp=f9d96c7efcd9a2d7dd115c7c97f5ec5ddb1608fb;hpb=88066b3a67b78329a02ffca3ac76ba1230de6b12;p=elogind.git

diff --git a/unit.h b/unit.h
index f9d96c7ef..2433cc7d7 100644
--- a/unit.h
+++ b/unit.h
@@ -14,14 +14,11 @@ typedef enum UnitLoadState UnitLoadState;
 typedef enum UnitActiveState UnitActiveState;
 typedef enum UnitDependency UnitDependency;
 
-#include "job.h"
-#include "manager.h"
 #include "set.h"
 #include "util.h"
 #include "list.h"
 #include "socket-util.h"
 #include "execute.h"
-#include "util.h"
 
 #define UNIT_NAME_MAX 128
 #define DEFAULT_TIMEOUT_USEC (20*USEC_PER_SEC)
@@ -92,6 +89,9 @@ enum UnitDependency {
         _UNIT_DEPENDENCY_INVALID = -1
 };
 
+#include "manager.h"
+#include "job.h"
+
 struct Meta {
         Manager *manager;
         UnitType type;
@@ -116,6 +116,9 @@ struct Meta {
 
         /* Load queue */
         LIST_FIELDS(Meta, load_queue);
+
+        /* Per type list */
+        LIST_FIELDS(Meta, units_per_type);
 };
 
 #include "service.h"
@@ -144,6 +147,7 @@ struct UnitVTable {
 
         int (*init)(Unit *u);
         void (*done)(Unit *u);
+        int (*coldplug)(Unit *u);
 
         void (*dump)(Unit *u, FILE *f, const char *prefix);
 
@@ -160,6 +164,16 @@ struct UnitVTable {
         void (*fd_event)(Unit *u, int fd, uint32_t events, Watch *w);
         void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
         void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
+
+        /* 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
+         * inactive state. It is the job of the coldplug() call above
+         * to put the units into the initial state.  */
+        int (*enumerate)(Manager *m);
+
+        /* Type specific cleanups. */
+        void (*shutdown)(Manager *m);
 };
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
@@ -198,6 +212,9 @@ 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_choose_id(Unit *u, const char *name);
+int unit_set_description(Unit *u, const char *description);
+
 void unit_add_to_load_queue(Unit *u);
 
 int unit_merge(Unit *u, Unit *other);
@@ -235,6 +252,6 @@ 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 *path, const char *suffix);
+char *unit_name_escape_path(const char *prefix, const char *path, const char *suffix);
 
 #endif