strv: add various strv calls

[elogind.git] / manager.h

diff --git a/manager.h b/manager.h
index ea4e0a4c6f4a9b15e65685dcd9c745058c309a3f..45fb0944b9b1f04966465e80252019a93b9acb6d 100644 (file)
--- 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_USER,      /* non-root */
+        _MANAGER_RUNNING_AS_MAX,
+        _MANAGER_RUNNING_AS_INVALID = -1
+} ManagerRunningAs;
+
 enum WatchType {
         WATCH_INVALID,
         WATCH_SIGNAL,
@@ -69,6 +77,9 @@ struct Watch {
 #define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.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,14 +100,20 @@ 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);
+
         /* 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 is_init:1;
+        bool dispatching_dbus_queue:1;
 
         bool request_bus_dispatch:1;
 
@@ -117,6 +134,7 @@ struct Manager {
 
         /* Data specific to the D-Bus subsystem */
         DBusConnection *bus;
+        Set *subscribed;
 };
 
 Manager* manager_new(void);
@@ -140,9 +158,13 @@ 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);
+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);
+
 #endif