X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.h;h=d8559f1bec40a7ccf580215e0929801606ca60a9;hp=7328724b090b44bdf205e3b2e286a6cdf81032aa;hb=59d1a83370e333e906015a48dc9c1f1a458911f5;hpb=8fe914ec81d9f57bcc083036f528b00119ed2e3b

diff --git a/src/manager.h b/src/manager.h
index 7328724b0..d8559f1be 100644
--- 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
@@ -30,7 +30,7 @@
 #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;
@@ -41,13 +41,17 @@ typedef enum ManagerExitCode {
         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_SESSION,
+        MANAGER_USER,
         _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_SWAP,
         WATCH_UDEV,
         WATCH_DBUS_WATCH,
         WATCH_DBUS_TIMEOUT
@@ -87,8 +92,6 @@ struct Watch {
 #include "path-lookup.h"
 
 struct Manager {
-        uint32_t current_job_id;
-
         /* Note that the set of units we know of is allowed to be
          * incosistent. However the subset of it that is loaded may
          * not, and the list of jobs may neither. */
@@ -139,8 +142,14 @@ struct Manager {
         Set *unit_path_cache;
 
         char **environment;
+        char **default_controllers;
 
+        dual_timestamp initrd_timestamp;
         dual_timestamp startup_timestamp;
+        dual_timestamp finish_timestamp;
+
+        char *console;
+        char *generator_unit_path;
 
         /* Data specific to the device subsystem */
         struct udev* udev;
@@ -154,6 +163,9 @@ struct Manager {
 
         /* 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;
@@ -170,6 +182,8 @@ struct Manager {
         int32_t name_data_slot;
         int32_t subscribed_data_slot;
 
+        uint32_t current_job_id;
+
         /* Data specific to the Automount subsystem */
         int dev_autofs_fd;
 
@@ -185,20 +199,31 @@ struct Manager {
          * file system */
         int pin_cgroupfs_fd;
 
+        /* Audit fd */
+#ifdef HAVE_AUDIT
+        int audit_fd;
+#endif
+
         /* 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 utmp_reboot_written:1;
+        bool show_status;
+        bool confirm_spawn;
+#ifdef HAVE_SYSV_COMPAT
+        bool sysv_console;
+#endif
+        bool mount_auto;
+        bool swap_auto;
 
         int n_deserializing;
 
-        bool show_status;
-        bool confirm_spawn;
+        unsigned n_installed_jobs;
+        unsigned n_failed_jobs;
 };
 
 int manager_new(ManagerRunningAs running_as, Manager **m);
@@ -231,15 +256,15 @@ 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);
+int manager_set_console(Manager *m, const char *console);
+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);
 
-int manager_open_serialization(FILE **_f);
+int manager_open_serialization(Manager *m, FILE **_f);
 
 int manager_serialize(Manager *m, FILE *f, FDSet *fds);
 int manager_deserialize(Manager *m, FILE *f, FDSet *fds);
@@ -248,7 +273,17 @@ int manager_reload(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);
 
 const char *manager_running_as_to_string(ManagerRunningAs i);
 ManagerRunningAs manager_running_as_from_string(const char *s);