X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=303201b74d910eceb2c841f0082c3da397b37458;hp=432d730d7f40d7dc71c4d4bcc445e729daa9b93a;hb=acbb02252a38214ecba3aa8a5c9b3669f9c9317e;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662

diff --git a/manager.h b/manager.h
index 432d730d7..303201b74 100644
--- a/manager.h
+++ b/manager.h
@@ -8,7 +8,21 @@
 #include <stdio.h>
 
 typedef struct Manager Manager;
-typedef enum ManagerEventType ManagerEventType;
+typedef enum WatchType WatchType;
+typedef struct Watch Watch;
+
+enum WatchType {
+        WATCH_INVALID,
+        WATCH_SIGNAL_FD,
+        WATCH_FD,
+        WATCH_TIMER
+};
+
+struct Watch {
+        int fd;
+        WatchType type;
+        union Unit *unit;
+};
 
 #include "unit.h"
 #include "job.h"
@@ -16,12 +30,6 @@ typedef enum ManagerEventType ManagerEventType;
 #include "list.h"
 #include "set.h"
 
-enum ManagerEventType {
-        MANAGER_SIGNAL,
-        MANAGER_FD,
-        MANAGER_TIMER
-};
-
 struct Manager {
         uint32_t current_job_id;
 
@@ -49,7 +57,8 @@ struct Manager {
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
         int epoll_fd;
-        int signal_fd;
+
+        Watch signal_watch;
 };
 
 Manager* manager_new(void);
@@ -58,7 +67,7 @@ void manager_free(Manager *m);
 Job *manager_get_job(Manager *m, uint32_t id);
 Unit *manager_get_unit(Manager *m, const char *name);
 
-int manager_load_unit(Manager *m, const char *name, Unit **_ret);
+int manager_load_unit(Manager *m, const char *path_or_name, Unit **_ret);
 int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret);
 
 void manager_dump_units(Manager *s, FILE *f, const char *prefix);