job: timeout every job independently of the unit

[elogind.git] / src / manager.h

diff --git a/src/manager.h b/src/manager.h
index e5cf3a1c520d5831af7a72f9cea817a47fff7ab0..c492ffa55f179a171dad2e430144081269fdc7a5 100644 (file)
--- a/src/manager.h
+++ b/src/manager.h
@@ -57,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,


@@ -69,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;


@@ -134,6 +136,7 @@ struct Manager {
         unsigned n_snapshots;
 
         LookupPaths lookup_paths;
         unsigned n_snapshots;
 
         LookupPaths lookup_paths;

+        Set *unit_path_cache;

 
         char **environment;
 
 
         char **environment;
 


@@ -171,8 +174,6 @@ struct Manager {
 
         /* Data specific to the cgroup subsystem */
         Hashmap *cgroup_bondings; /* path string => CGroupBonding object 1:n */
 
         /* 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;


@@ -193,6 +194,8 @@ struct Manager {
 
         bool utmp_reboot_written:1;
 
 
         bool utmp_reboot_written:1;
 

+        int n_deserializing;
+

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