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

diff --git a/manager.h b/manager.h
index 432d730d7..88b8509cf 100644
--- a/manager.h
+++ b/manager.h
@@ -8,7 +8,22 @@
 #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,
+        WATCH_FD,
+        WATCH_TIMER,
+        WATCH_MOUNT
+};
+
+struct Watch {
+        int fd;
+        WatchType type;
+        union Unit *unit;
+};
 
 #include "unit.h"
 #include "job.h"
@@ -16,11 +31,12 @@ typedef enum ManagerEventType ManagerEventType;
 #include "list.h"
 #include "set.h"
 
-enum ManagerEventType {
-        MANAGER_SIGNAL,
-        MANAGER_FD,
-        MANAGER_TIMER
-};
+#define SPECIAL_DEFAULT_TARGET "default.target"
+#define SPECIAL_SYSLOG_SERVICE "syslog.service"
+#define SPECIAL_DBUS_SERVICE "messagebus.service"
+#define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
+#define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
+#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target"
 
 struct Manager {
         uint32_t current_job_id;
@@ -33,6 +49,10 @@ struct Manager {
         Hashmap *units;  /* name string => Unit object n:1 */
         Hashmap *jobs;   /* job id => Job object 1:1 */
 
+        /* To make it easy to iterate through the units of a specific
+         * type we maintain a per type linked list */
+        LIST_HEAD(Meta, units_per_type[_UNIT_TYPE_MAX]);
+
         /* Units that need to be loaded */
         LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
 
@@ -49,16 +69,26 @@ struct Manager {
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
         int epoll_fd;
-        int signal_fd;
+
+        Watch signal_watch;
+
+        /* Data specific to the device subsystem */
+        struct udev* udev;
+
+        /* Data specific to the mount subsystem */
+        FILE *proc_self_mountinfo;
+        Watch mount_watch;
 };
 
 Manager* manager_new(void);
 void manager_free(Manager *m);
 
+int manager_coldplug(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);
@@ -68,7 +98,9 @@ void manager_transaction_unlink_job(Manager *m, Job *j);
 
 void manager_clear_jobs(Manager *m);
 
+void manager_dispatch_load_queue(Manager *m);
 void manager_dispatch_run_queue(Manager *m);
+
 int manager_loop(Manager *m);
 
 #endif