X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Funit.h;h=43bbe6757363ec18881d95c7db0a121d086a3a7b;hb=7640a5de1b3ffe6547200ad204d14e4f067caf4f;hp=5f55a89da8d7f456181b2df90347689ad1369c9a;hpb=35b8ca3aaf8cb044ad76675dfcad89e000dd4a5c;p=elogind.git

diff --git a/src/unit.h b/src/unit.h
index 5f55a89da..43bbe6757 100644
--- a/src/unit.h
+++ b/src/unit.h
@@ -40,9 +40,6 @@ typedef enum UnitDependency UnitDependency;
 #include "execute.h"
 #include "condition.h"
 
-#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)
-#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
-
 enum UnitType {
         UNIT_SERVICE = 0,
         UNIT_SOCKET,
@@ -160,6 +157,8 @@ struct Meta {
         /* Conditions to check */
         LIST_HEAD(Condition, conditions);
 
+        dual_timestamp condition_timestamp;
+
         dual_timestamp inactive_exit_timestamp;
         dual_timestamp active_enter_timestamp;
         dual_timestamp active_exit_timestamp;
@@ -208,6 +207,15 @@ struct Meta {
         /* Allow isolation requests */
         bool allow_isolate;
 
+        /* Isolate OnFailure unit */
+        bool on_failure_isolate;
+
+        /* Ignore this unit when isolating */
+        bool ignore_on_isolate;
+
+        /* Did the last condition check suceed? */
+        bool condition_result;
+
         bool in_load_queue:1;
         bool in_dbus_queue:1;
         bool in_cleanup_queue:1;
@@ -362,9 +370,6 @@ struct UnitVTable {
         /* Exclude from automatic gc */
         bool no_gc:1;
 
-        /* Exclude from stopping on isolation requests */
-        bool no_isolate:1;
-
         /* Show status updates on the console */
         bool show_status:1;
 };
@@ -513,6 +518,8 @@ bool unit_name_is_valid(const char *n, bool template_ok);
 
 void unit_trigger_on_failure(Unit *u);
 
+bool unit_condition_test(Unit *u);
+
 const char *unit_load_state_to_string(UnitLoadState i);
 UnitLoadState unit_load_state_from_string(const char *s);