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

diff --git a/unit.h b/unit.h
index 7803f3183..2433cc7d7 100644
--- a/unit.h
+++ b/unit.h
@@ -14,16 +14,13 @@ 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 32
+#define UNIT_NAME_MAX 128
 #define DEFAULT_TIMEOUT_USEC (20*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 
@@ -92,6 +89,9 @@ enum UnitDependency {
         _UNIT_DEPENDENCY_INVALID = -1
 };
 
+#include "manager.h"
+#include "job.h"
+
 struct Meta {
         Manager *manager;
         UnitType type;
@@ -103,6 +103,7 @@ 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 */
 
         /* If there is something to do with this unit, then this is
          * the job for it */
@@ -115,6 +116,9 @@ struct Meta {
 
         /* Load queue */
         LIST_FIELDS(Meta, load_queue);
+
+        /* Per type list */
+        LIST_FIELDS(Meta, units_per_type);
 };
 
 #include "service.h"
@@ -143,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);
 
@@ -156,11 +161,19 @@ struct UnitVTable {
          * a simpler one that the engine can understand */
         UnitActiveState (*active_state)(Unit *u);
 
-        void (*fd_event)(Unit *u, int fd, uint32_t events);
+        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, int id, uint64_t n_elapsed);
+        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);
 
-        void (*retry)(Unit *u);
+        /* Type specific cleanups. */
+        void (*shutdown)(Manager *m);
 };
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
@@ -197,6 +210,10 @@ 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_choose_id(Unit *u, const char *name);
+int unit_set_description(Unit *u, const char *description);
 
 void unit_add_to_load_queue(Unit *u);
 
@@ -221,15 +238,20 @@ int unit_reload(Unit *u);
 
 void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
 
-int unit_watch_fd(Unit *u, int fd, uint32_t events);
-void unit_unwatch_fd(Unit *u, int fd);
+int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
+void unit_unwatch_fd(Unit *u, Watch *w);
 
 int unit_watch_pid(Unit *u, pid_t pid);
 void unit_unwatch_pid(Unit *u, pid_t pid);
 
-int unit_watch_timer(Unit *u, usec_t delay, int *id);
-void unit_unwatch_timer(Unit *u, int *id);
+int unit_watch_timer(Unit *u, usec_t delay, Watch *w);
+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);
+
 #endif