X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=b2b93e9b45f9cd0fd04e8143363d436015b02b7f;hp=303201b74d910eceb2c841f0082c3da397b37458;hb=38b48754f787e7956dc97ebae6891203358a032e;hpb=acbb02252a38214ecba3aa8a5c9b3669f9c9317e

diff --git a/manager.h b/manager.h
index 303201b74..b2b93e9b4 100644
--- a/manager.h
+++ b/manager.h
@@ -7,21 +7,32 @@
 #include <inttypes.h>
 #include <stdio.h>
 
+#include <dbus/dbus.h>
+
 typedef struct Manager Manager;
 typedef enum WatchType WatchType;
 typedef struct Watch Watch;
 
 enum WatchType {
         WATCH_INVALID,
-        WATCH_SIGNAL_FD,
+        WATCH_SIGNAL,
         WATCH_FD,
-        WATCH_TIMER
+        WATCH_TIMER,
+        WATCH_MOUNT,
+        WATCH_UDEV,
+        WATCH_DBUS_WATCH,
+        WATCH_DBUS_TIMEOUT
 };
 
 struct Watch {
         int fd;
         WatchType type;
-        union Unit *unit;
+        bool fd_is_dupped;
+        union {
+                union Unit *unit;
+                DBusWatch *bus_watch;
+                DBusTimeout *bus_timeout;
+        } data;
 };
 
 #include "unit.h"
@@ -29,6 +40,14 @@ struct Watch {
 #include "hashmap.h"
 #include "list.h"
 #include "set.h"
+#include "dbus.h"
+
+#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;
@@ -41,6 +60,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. */
 
@@ -54,19 +77,40 @@ struct Manager {
         bool dispatching_load_queue:1;
         bool dispatching_run_queue:1;
 
+        bool is_init:1;
+
+        bool request_bus_dispatch:1;
+
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
         int epoll_fd;
 
         Watch signal_watch;
+
+        /* Data specific to the device subsystem */
+        struct udev* udev;
+        struct udev_monitor* udev_monitor;
+        Watch udev_watch;
+
+        /* Data specific to the mount subsystem */
+        FILE *proc_self_mountinfo;
+        Watch mount_watch;
+
+        /* Data specific to the D-Bus subsystem */
+        DBusConnection *bus;
 };
 
 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_get_unit_from_dbus_path(Manager *m, const char *s, Unit **_u);
+int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j);
+
 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);
 
@@ -77,7 +121,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