add basic udev device enumeration module

[elogind.git] / unit.h

diff --git a/unit.h b/unit.h
index 7803f3183cc9f7332f8d4f0ef4d140b18ec351a1..7ab2ccdfbcef004f7b9d0592094150cd2cda3c42 100644 (file)
--- a/unit.h
+++ b/unit.h
@@ -23,7 +23,7 @@ typedef enum UnitDependency UnitDependency;
 #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)
 
@@ -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 */
@@ -156,11 +157,12 @@ 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);
 
-        void (*retry)(Unit *u);
+        int (*enumerate)(Manager *m);
+        void (*shutdown)(Manager *m);
 };
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
@@ -197,6 +199,7 @@ 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);
 
 void unit_add_to_load_queue(Unit *u);
 
@@ -221,15 +224,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 *path, const char *suffix);
+
 #endif