X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=3ae8126f90738af4827723a7d1ae697641ffb60e;hp=ea4e0a4c6f4a9b15e65685dcd9c745058c309a3f;hb=e24067c3ec0e16e94e9620d4f7a06ccc4b637eb4;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6

diff --git a/manager.h b/manager.h
index ea4e0a4c6..3ae8126f9 100644
--- a/manager.h
+++ b/manager.h
@@ -32,6 +32,14 @@ typedef struct Manager Manager;
 typedef enum WatchType WatchType;
 typedef struct Watch Watch;
 
+typedef enum ManagerRunningAs {
+        MANAGER_INIT,      /* root and pid=1 */
+        MANAGER_SYSTEM,    /* root and pid!=1 */
+        MANAGER_SESSION,   /* non-root */
+        _MANAGER_RUNNING_AS_MAX,
+        _MANAGER_RUNNING_AS_INVALID = -1
+} ManagerRunningAs;
+
 enum WatchType {
         WATCH_INVALID,
         WATCH_SIGNAL,
@@ -62,13 +70,41 @@ struct Watch {
 #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"
+#define SPECIAL_LOCAL_FS_TARGET "local-fs.target"
+#define SPECIAL_NETWORK_TARGET "network.target"
+#define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target"     /* LSB's $named */
+#define SPECIAL_RPCBIND_TARGET "rpcbind.target"           /* LSB's $portmap */
+#define SPECIAL_REMOTE_FS_TARGET "remote-fs.target"
+#define SPECIAL_SYSLOG_TARGET "syslog.target"             /* Should pull in syslog.socket or syslog.service */
+#define SPECIAL_RTC_SET_TARGET "rtc-set.target"           /* LSB's $time */
+#define SPECIAL_BASIC_TARGET "basic.target"
+#define SPECIAL_RESCUE_TARGET "rescue.target"
+
+#ifndef SPECIAL_DBUS_SERVICE
+#define SPECIAL_DBUS_SERVICE "dbus.service"
+#endif
+
+#ifndef SPECIAL_SYSLOG_SERVICE
+#define SPECIAL_SYSLOG_SERVICE "syslog.service"
+#endif
+
+/* For SysV compatibility. Usually an alias for a saner target. On
+ * SysV-free systems this doesn't exist. */
+#define SPECIAL_RUNLEVEL0_TARGET "runlevel0.target"
+#define SPECIAL_RUNLEVEL1_TARGET "runlevel1.target"
+#define SPECIAL_RUNLEVEL2_TARGET "runlevel2.target"
+#define SPECIAL_RUNLEVEL3_TARGET "runlevel3.target"
+#define SPECIAL_RUNLEVEL4_TARGET "runlevel4.target"
+#define SPECIAL_RUNLEVEL5_TARGET "runlevel5.target"
+#define SPECIAL_RUNLEVEL6_TARGET "runlevel6.target"
 
 struct Manager {
+        /* In which mode are we running */
+        ManagerRunningAs running_as;
+
         uint32_t current_job_id;
 
         /* Note that the set of units we know of is allowed to be
@@ -89,16 +125,27 @@ struct Manager {
         /* Jobs that need to be run */
         LIST_HEAD(Job, run_queue);   /* more a stack than a queue, too */
 
+        /* Units and jobs that have not yet been announced via
+         * D-Bus. When something about a job changes it is added here
+         * if it is not in there yet. This allows easy coalescing of
+         * D-Bus change signals. */
+        LIST_HEAD(Meta, dbus_unit_queue);
+        LIST_HEAD(Job, dbus_job_queue);
+
+        LIST_HEAD(Meta, cleanup_queue);
+
         /* Jobs to be added */
         Hashmap *transaction_jobs;      /* Unit object => Job object list 1:1 */
         JobDependency *transaction_anchor;
 
         bool dispatching_load_queue:1;
         bool dispatching_run_queue:1;
+        bool dispatching_dbus_queue:1;
 
-        bool is_init:1;
+        bool request_api_bus_dispatch:1;
+        bool request_system_bus_dispatch:1;
 
-        bool request_bus_dispatch:1;
+        bool utmp_reboot_written:1;
 
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
@@ -106,6 +153,10 @@ struct Manager {
 
         Watch signal_watch;
 
+        char **unit_path;
+        char **sysvinit_path;
+        char **sysvrcnd_path;
+
         /* Data specific to the device subsystem */
         struct udev* udev;
         struct udev_monitor* udev_monitor;
@@ -116,10 +167,18 @@ struct Manager {
         Watch mount_watch;
 
         /* Data specific to the D-Bus subsystem */
-        DBusConnection *bus;
+        DBusConnection *api_bus, *system_bus;
+        Set *subscribed;
+
+        /* Data specific to the cgroup subsystem */
+        Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
+        char *cgroup_controller;
+        char *cgroup_hierarchy;
+
+        usec_t boot_timestamp;
 };
 
-Manager* manager_new(void);
+int manager_new(ManagerRunningAs running_as, Manager **m);
 void manager_free(Manager *m);
 
 int manager_coldplug(Manager *m);
@@ -136,13 +195,21 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for
 void manager_dump_units(Manager *s, FILE *f, const char *prefix);
 void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
 
-void manager_transaction_unlink_job(Manager *m, Job *j);
+void manager_transaction_unlink_job(Manager *m, Job *j, bool delete_dependencies);
 
 void manager_clear_jobs(Manager *m);
 
-void manager_dispatch_load_queue(Manager *m);
-void manager_dispatch_run_queue(Manager *m);
+unsigned manager_dispatch_load_queue(Manager *m);
+unsigned manager_dispatch_run_queue(Manager *m);
+unsigned manager_dispatch_dbus_queue(Manager *m);
 
 int manager_loop(Manager *m);
 
+const char *manager_running_as_to_string(ManagerRunningAs i);
+ManagerRunningAs manager_running_as_from_string(const char *s);
+
+void manager_write_utmp_reboot(Manager *m);
+
+void manager_write_utmp_runlevel(Manager *m, Unit *t);
+
 #endif