systemctl: introduce reset-maintenance command

[elogind.git] / src / manager.h

diff --git a/src/manager.h b/src/manager.h
index 762a891ca61d7242700a77eee73208727579a451..96de120d317dcacac5794fb8d484eaa5a05f3a51 100644 (file)
--- a/src/manager.h
+++ b/src/manager.h
@@ -46,9 +46,8 @@ typedef enum ManagerExitCode {
 } ManagerExitCode;
 
 typedef enum ManagerRunningAs {
 } 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;
         _MANAGER_RUNNING_AS_MAX,
         _MANAGER_RUNNING_AS_INVALID = -1
 } ManagerRunningAs;


@@ -58,7 +57,8 @@ enum WatchType {
         WATCH_SIGNAL,
         WATCH_NOTIFY,
         WATCH_FD,
         WATCH_SIGNAL,
         WATCH_NOTIFY,
         WATCH_FD,

-        WATCH_TIMER,
+        WATCH_UNIT_TIMER,
+        WATCH_JOB_TIMER,

         WATCH_MOUNT,
         WATCH_UDEV,
         WATCH_DBUS_WATCH,
         WATCH_MOUNT,
         WATCH_UDEV,
         WATCH_DBUS_WATCH,


@@ -70,6 +70,7 @@ struct Watch {
         WatchType type;
         union {
                 union Unit *unit;
         WatchType type;
         union {
                 union Unit *unit;

+                struct Job *job;

                 DBusWatch *bus_watch;
                 DBusTimeout *bus_timeout;
         } data;
                 DBusWatch *bus_watch;
                 DBusTimeout *bus_timeout;
         } data;


@@ -125,6 +126,8 @@ struct Manager {
 
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
 
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 

+        char *notify_socket;
+

         Watch notify_watch;
         Watch signal_watch;
 
         Watch notify_watch;
         Watch signal_watch;
 


@@ -133,10 +136,11 @@ struct Manager {
         unsigned n_snapshots;
 
         LookupPaths lookup_paths;
         unsigned n_snapshots;
 
         LookupPaths lookup_paths;

+        Set *unit_path_cache;

 
         char **environment;
 
 
         char **environment;
 

-        timestamp startup_timestamp;
+        dual_timestamp startup_timestamp;

 
         /* Data specific to the device subsystem */
         struct udev* udev;
 
         /* Data specific to the device subsystem */
         struct udev* udev;


@@ -152,22 +156,24 @@ struct Manager {
 
         /* Data specific to the D-Bus subsystem */
         DBusConnection *api_bus, *system_bus;
 
         /* Data specific to the D-Bus subsystem */
         DBusConnection *api_bus, *system_bus;

-        Set *subscribed;
+        DBusServer *private_bus;
+        Set *bus_connections, *bus_connections_for_dispatch;
+

         DBusMessage *queued_message; /* This is used during reloading:
                                       * before the reload we queue the
                                       * reply message here, and
                                       * afterwards we send it */
         DBusMessage *queued_message; /* This is used during reloading:
                                       * before the reload we queue the
                                       * reply message here, and
                                       * afterwards we send it */

+        DBusConnection *queued_message_connection; /* The connection to send the queued message on */

 
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
         int32_t name_data_slot;
 
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
         int32_t name_data_slot;

+        int32_t subscribed_data_slot;

 
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
 
         /* Data specific to the cgroup subsystem */
         Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
 
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
 
         /* 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;
         char *cgroup_hierarchy;
 
         usec_t gc_queue_timestamp;


@@ -186,15 +192,15 @@ struct Manager {
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 
         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 utmp_reboot_written:1;
 

-        bool confirm_spawn:1;
+        int n_deserializing;
+
+        bool show_status;
+        bool confirm_spawn;

 };
 
 };
 

-int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m);
+int manager_new(ManagerRunningAs running_as, Manager **m);

 void manager_free(Manager *m);
 
 int manager_enumerate(Manager *m);
 void manager_free(Manager *m);
 
 int manager_enumerate(Manager *m);


@@ -207,11 +213,11 @@ 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_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_prepare(Manager *m, const char *name, const char *path, Unit **_ret);
-int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret);
+int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret);
+int manager_load_unit(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret);

 
 

-int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret);
-int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool force, Job **_ret);
+int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, DBusError *e, Job **_ret);
+int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool force, DBusError *e, Job **_ret);

 
 void manager_dump_units(Manager *s, FILE *f, const char *prefix);
 void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
 
 void manager_dump_units(Manager *s, FILE *f, const char *prefix);
 void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);


@@ -239,6 +245,10 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
 
 int manager_reload(Manager *m);
 
 
 int manager_reload(Manager *m);
 

+bool manager_is_booting_or_shutting_down(Manager *m);
+
+void manager_reset_maintenance(Manager *m);
+

 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);
 
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);