manager: fix GC logic

[elogind.git] / manager.h

diff --git a/manager.h b/manager.h
index 8a48c5519cea30278f7f8cba11bf53340036468b..bd0c82ee7706d2a94a5abfb5c3211bf73f5d19fa 100644 (file)
--- a/manager.h
+++ b/manager.h
@@ -64,13 +64,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;
 };
 
 #include "unit.h"
@@ -118,9 +118,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 +145,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 +189,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);