unit: remove union Unit

[elogind.git] / src / manager.h

diff --git a/src/manager.h b/src/manager.h
index a762dbc7c33e0dfdd9e85b9983f8eb8656c6c90e..5e65fdb8fc25ea4a82ebc34ce7b8e21e40a14c4a 100644 (file)
--- a/src/manager.h
+++ b/src/manager.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/

 
 #ifndef foomanagerhfoo
 #define foomanagerhfoo
 
 #ifndef foomanagerhfoo
 #define foomanagerhfoo


@@ -30,7 +30,7 @@
 #include "fdset.h"
 
 /* Enforce upper limit how many names we allow */
 #include "fdset.h"
 
 /* Enforce upper limit how many names we allow */

-#define MANAGER_MAX_NAMES 2048
+#define MANAGER_MAX_NAMES 131072 /* 128K */

 
 typedef struct Manager Manager;
 typedef enum WatchType WatchType;
 
 typedef struct Manager Manager;
 typedef enum WatchType WatchType;


@@ -41,13 +41,17 @@ typedef enum ManagerExitCode {
         MANAGER_EXIT,
         MANAGER_RELOAD,
         MANAGER_REEXECUTE,
         MANAGER_EXIT,
         MANAGER_RELOAD,
         MANAGER_REEXECUTE,

+        MANAGER_REBOOT,
+        MANAGER_POWEROFF,
+        MANAGER_HALT,
+        MANAGER_KEXEC,

         _MANAGER_EXIT_CODE_MAX,
         _MANAGER_EXIT_CODE_INVALID = -1
 } ManagerExitCode;
 
 typedef enum ManagerRunningAs {
         MANAGER_SYSTEM,
         _MANAGER_EXIT_CODE_MAX,
         _MANAGER_EXIT_CODE_INVALID = -1
 } ManagerExitCode;
 
 typedef enum ManagerRunningAs {
         MANAGER_SYSTEM,

-        MANAGER_SESSION,
+        MANAGER_USER,

         _MANAGER_RUNNING_AS_MAX,
         _MANAGER_RUNNING_AS_INVALID = -1
 } ManagerRunningAs;
         _MANAGER_RUNNING_AS_MAX,
         _MANAGER_RUNNING_AS_INVALID = -1
 } ManagerRunningAs;


@@ -60,6 +64,7 @@ enum WatchType {
         WATCH_UNIT_TIMER,
         WATCH_JOB_TIMER,
         WATCH_MOUNT,
         WATCH_UNIT_TIMER,
         WATCH_JOB_TIMER,
         WATCH_MOUNT,

+        WATCH_SWAP,

         WATCH_UDEV,
         WATCH_DBUS_WATCH,
         WATCH_DBUS_TIMEOUT
         WATCH_UDEV,
         WATCH_DBUS_WATCH,
         WATCH_DBUS_TIMEOUT


@@ -69,7 +74,7 @@ struct Watch {
         int fd;
         WatchType type;
         union {
         int fd;
         WatchType type;
         union {

-                union Unit *unit;
+                struct Unit *unit;

                 struct Job *job;
                 DBusWatch *bus_watch;
                 DBusTimeout *bus_timeout;
                 struct Job *job;
                 DBusWatch *bus_watch;
                 DBusTimeout *bus_timeout;


@@ -87,10 +92,8 @@ struct Watch {
 #include "path-lookup.h"
 
 struct Manager {
 #include "path-lookup.h"
 
 struct Manager {

-        uint32_t current_job_id;
-

         /* Note that the set of units we know of is allowed to be
         /* Note that the set of units we know of is allowed to be

-         * incosistent. However the subset of it that is loaded may
+         * inconsistent. However the subset of it that is loaded may

          * not, and the list of jobs may neither. */
 
         /* Active jobs and units */
          * not, and the list of jobs may neither. */
 
         /* Active jobs and units */


@@ -99,10 +102,10 @@ struct Manager {
 
         /* To make it easy to iterate through the units of a specific
          * type we maintain a per type linked list */
 
         /* 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]);
+        LIST_HEAD(Unit, units_by_type[_UNIT_TYPE_MAX]);

 
         /* Units that need to be loaded */
 
         /* Units that need to be loaded */

-        LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
+        LIST_HEAD(Unit, load_queue); /* this is actually more a stack than a queue, but uh. */

 
         /* Jobs that need to be run */
         LIST_HEAD(Job, run_queue);   /* more a stack than a queue, too */
 
         /* Jobs that need to be run */
         LIST_HEAD(Job, run_queue);   /* more a stack than a queue, too */


@@ -111,14 +114,14 @@ struct Manager {
          * 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. */
          * 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(Unit, dbus_unit_queue);

         LIST_HEAD(Job, dbus_job_queue);
 
         /* Units to remove */
         LIST_HEAD(Job, dbus_job_queue);
 
         /* Units to remove */

-        LIST_HEAD(Meta, cleanup_queue);
+        LIST_HEAD(Unit, cleanup_queue);

 
         /* Units to check when doing GC */
 
         /* Units to check when doing GC */

-        LIST_HEAD(Meta, gc_queue);
+        LIST_HEAD(Unit, gc_queue);

 
         /* Jobs to be added */
         Hashmap *transaction_jobs;      /* Unit object => Job object list 1:1 */
 
         /* Jobs to be added */
         Hashmap *transaction_jobs;      /* Unit object => Job object list 1:1 */


@@ -139,8 +142,13 @@ struct Manager {
         Set *unit_path_cache;
 
         char **environment;
         Set *unit_path_cache;
 
         char **environment;

+        char **default_controllers;

 
 

+        dual_timestamp initrd_timestamp;

         dual_timestamp startup_timestamp;
         dual_timestamp startup_timestamp;

+        dual_timestamp finish_timestamp;
+
+        char *generator_unit_path;

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


@@ -154,6 +162,9 @@ struct Manager {
 
         /* Data specific to the swap filesystem */
         FILE *proc_swaps;
 
         /* Data specific to the swap filesystem */
         FILE *proc_swaps;

+        Hashmap *swaps_by_proc_swaps;
+        bool request_reload;
+        Watch swap_watch;

 
         /* Data specific to the D-Bus subsystem */
         DBusConnection *api_bus, *system_bus;
 
         /* Data specific to the D-Bus subsystem */
         DBusConnection *api_bus, *system_bus;


@@ -168,8 +179,11 @@ struct Manager {
 
         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 conn_data_slot;

         int32_t subscribed_data_slot;
 
         int32_t subscribed_data_slot;
 

+        uint32_t current_job_id;
+

         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
 
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
 


@@ -181,25 +195,40 @@ struct Manager {
         int gc_marker;
         unsigned n_in_gc_queue;
 
         int gc_marker;
         unsigned n_in_gc_queue;
 

-        /* Make sure the user cannot accidentaly unmount our cgroup
+        /* Make sure the user cannot accidentally unmount our cgroup

          * file system */
         int pin_cgroupfs_fd;
 
          * file system */
         int pin_cgroupfs_fd;
 

+        /* Audit fd */
+#ifdef HAVE_AUDIT
+        int audit_fd;
+#endif
+

         /* Flags */
         ManagerRunningAs running_as;
         /* Flags */
         ManagerRunningAs running_as;

-        ManagerExitCode exit_code:4;
+        ManagerExitCode exit_code:5;

 
         bool dispatching_load_queue:1;
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 
 
         bool dispatching_load_queue:1;
         bool dispatching_run_queue:1;
         bool dispatching_dbus_queue:1;
 

-        bool utmp_reboot_written:1;
-
-        int n_deserializing;
+        bool taint_usr:1;

 
         bool show_status;
         bool confirm_spawn;
 
         bool show_status;
         bool confirm_spawn;

+#ifdef HAVE_SYSV_COMPAT

         bool sysv_console;
         bool sysv_console;

+#endif
+        bool mount_auto;
+        bool swap_auto;
+
+        ExecOutput default_std_output, default_std_error;
+
+        /* non-zero if we are reloading or reexecuting, */
+        int n_reloading;
+
+        unsigned n_installed_jobs;
+        unsigned n_failed_jobs;

 };
 
 int manager_new(ManagerRunningAs running_as, Manager **m);
 };
 
 int manager_new(ManagerRunningAs running_as, Manager **m);


@@ -232,10 +261,9 @@ unsigned manager_dispatch_load_queue(Manager *m);
 unsigned manager_dispatch_run_queue(Manager *m);
 unsigned manager_dispatch_dbus_queue(Manager *m);
 
 unsigned manager_dispatch_run_queue(Manager *m);
 unsigned manager_dispatch_dbus_queue(Manager *m);
 

-int manager_loop(Manager *m);
+int manager_set_default_controllers(Manager *m, char **controllers);

 
 

-void manager_write_utmp_reboot(Manager *m);
-void manager_write_utmp_runlevel(Manager *m, Unit *t);
+int manager_loop(Manager *m);

 
 void manager_dispatch_bus_name_owner_changed(Manager *m, const char *name, const char* old_owner, const char *new_owner);
 void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid);
 
 void manager_dispatch_bus_name_owner_changed(Manager *m, const char *name, const char* old_owner, const char *new_owner);
 void manager_dispatch_bus_query_pid_done(Manager *m, const char *name, pid_t pid);


@@ -249,7 +277,22 @@ int manager_reload(Manager *m);
 
 bool manager_is_booting_or_shutting_down(Manager *m);
 
 
 bool manager_is_booting_or_shutting_down(Manager *m);
 

-void manager_reset_maintenance(Manager *m);
+void manager_reset_failed(Manager *m);
+
+void manager_send_unit_audit(Manager *m, Unit *u, int type, bool success);
+void manager_send_unit_plymouth(Manager *m, Unit *u);
+
+bool manager_unit_pending_inactive(Manager *m, const char *name);
+
+void manager_check_finished(Manager *m);
+
+void manager_run_generators(Manager *m);
+void manager_undo_generators(Manager *m);
+
+void manager_recheck_journal(Manager *m);
+
+void manager_set_show_status(Manager *m, bool b);
+bool manager_get_show_status(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);