dbus: complete exec status coverage

[elogind.git] / src / manager.h

diff --git a/src/manager.h b/src/manager.h
index 405f14356639015de97e413cf9825cac2b724a85..e856f5384b8ab3770e3697fabef72b00577c0784 100644 (file)
--- a/src/manager.h
+++ b/src/manager.h
@@ -46,9 +46,8 @@ typedef enum ManagerExitCode {
 } ManagerExitCode;
 
 typedef enum ManagerRunningAs {
-        MANAGER_INIT,      /* root and pid=1 */
-        MANAGER_SYSTEM,    /* root and pid!=1 */
-        MANAGER_SESSION,   /* non-root, for a session */
+        MANAGER_SYSTEM,
+        MANAGER_SESSION,
         _MANAGER_RUNNING_AS_MAX,
         _MANAGER_RUNNING_AS_INVALID = -1
 } ManagerRunningAs;
@@ -125,6 +124,8 @@ struct Manager {
 
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
+        char *notify_socket;
+
         Watch notify_watch;
         Watch signal_watch;
 
@@ -136,7 +137,7 @@ struct Manager {
 
         char **environment;
 
-        timestamp startup_timestamp;
+        dual_timestamp startup_timestamp;
 
         /* Data specific to the device subsystem */
         struct udev* udev;
@@ -152,6 +153,9 @@ struct Manager {
 
         /* Data specific to the D-Bus subsystem */
         DBusConnection *api_bus, *system_bus;
+        DBusServer *private_bus;
+        Set *bus_connections, *bus_connections_for_dispatch;
+
         Set *subscribed;
         DBusMessage *queued_message; /* This is used during reloading:
                                       * before the reload we queue the
@@ -167,12 +171,17 @@ struct Manager {
         /* Data specific to the cgroup subsystem */
         Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
         char *cgroup_controller;
+        char *cgroup_mount_point;
         char *cgroup_hierarchy;
 
         usec_t gc_queue_timestamp;
         int gc_marker;
         unsigned n_in_gc_queue;
 
+        /* Make sure the user cannot accidentaly unmount our cgroup
+         * file system */
+        int pin_cgroupfs_fd;
+
         /* Flags */
         ManagerRunningAs running_as;
         ManagerExitCode exit_code:4;
@@ -181,12 +190,9 @@ struct Manager {
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 
-        bool request_api_bus_dispatch:1;
-        bool request_system_bus_dispatch:1;
-
         bool utmp_reboot_written:1;
 
-        bool confirm_spawn:1;
+        bool confirm_spawn;
 };
 
 int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m);