X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.h;h=3790cfd281750ce15739c9358c2eeeebf2d7143f;hp=8a48c5519cea30278f7f8cba11bf53340036468b;hb=825636e5a88338436a1cd910319d020038389187;hpb=a16e112358ea8fea381ee106b89e645aed8b0a8c

diff --git a/manager.h b/manager.h
index 8a48c5519..3790cfd28 100644
--- a/manager.h
+++ b/manager.h
@@ -29,6 +29,9 @@
 
 #include "fdset.h"
 
+/* Enforce upper limit how many names we allow */
+#define MANAGER_MAX_NAMES 2048
+
 typedef struct Manager Manager;
 typedef enum WatchType WatchType;
 typedef struct Watch Watch;
@@ -64,13 +67,13 @@ enum WatchType {
 struct Watch {
         int fd;
         WatchType type;
-        bool fd_is_dupped;
         union {
                 union Unit *unit;
                 DBusWatch *bus_watch;
                 DBusTimeout *bus_timeout;
-                bool socket_accept;
         } data;
+        bool fd_is_dupped:1;
+        bool socket_accept:1;
 };
 
 #include "unit.h"
@@ -82,6 +85,12 @@ struct Watch {
 
 #define SPECIAL_DEFAULT_TARGET "default.target"
 
+/* This is not really intended to be started by directly. This is
+ * mostly so that other targets (reboot/halt/poweroff) can depend on
+ * it to bring all services down that want to be brought down on
+ * system shutdown. */
+#define SPECIAL_SHUTDOWN_TARGET "shutdown.target"
+
 #define SPECIAL_LOGGER_SOCKET "systemd-logger.socket"
 
 #define SPECIAL_KBREQUEST_TARGET "kbrequest.target"
@@ -118,9 +127,6 @@ struct Watch {
 #define SPECIAL_RUNLEVEL6_TARGET "runlevel6.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
@@ -148,30 +154,23 @@ struct Manager {
         LIST_HEAD(Meta, dbus_unit_queue);
         LIST_HEAD(Job, dbus_job_queue);
 
+        /* Units to remove */
         LIST_HEAD(Meta, cleanup_queue);
 
+        /* Units to check when doing GC */
+        LIST_HEAD(Meta, gc_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 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;
-
-        ManagerExitCode exit_code;
-
         Hashmap *watch_pids;  /* pid => Unit object n:1 */
 
+        Watch signal_watch;
+
         int epoll_fd;
 
-        Watch signal_watch;
+        unsigned n_snapshots;
 
         char **unit_path;
         char **sysvinit_path;
@@ -199,16 +198,33 @@ struct Manager {
         Hashmap *watch_bus;  /* D-Bus names => Unit object n:1 */
         int32_t name_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 */
         char *cgroup_controller;
         char *cgroup_hierarchy;
 
-        /* Data specific to the Automount subsystem */
-        int dev_autofs_fd;
+        usec_t gc_queue_timestamp;
 
-        /* Data specific to the Snapshot subsystem */
-        unsigned n_snapshots;
+        int gc_marker;
+        unsigned n_in_gc_queue;
+
+        /* Flags */
+        ManagerRunningAs running_as;
+        ManagerExitCode exit_code:4;
+
+        bool dispatching_load_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 confirm_spawn:1;
 };
 
 int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **m);