timer: make sure we restart timers even if units are still running or if one of their...

[elogind.git] / src / core / timer.h

diff --git a/src/core/timer.h b/src/core/timer.h
index c6d1d42e44ea67de069e04168556fbb7ca612b14..fed15e9165aef2fafc8f4c0e6e750a31f7b2c1d0 100644 (file)
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -24,6 +24,7 @@
 typedef struct Timer Timer;
 
 #include "unit.h"
+#include "calendarspec.h"
 
 typedef enum TimerState {
         TIMER_DEAD,
@@ -41,18 +42,21 @@ typedef enum TimerBase {
         TIMER_STARTUP,
         TIMER_UNIT_ACTIVE,
         TIMER_UNIT_INACTIVE,
+        TIMER_CALENDAR,
         _TIMER_BASE_MAX,
         _TIMER_BASE_INVALID = -1
 } TimerBase;
 
 typedef struct TimerValue {
-        usec_t value;
+        TimerBase base;
+        bool disabled;
+        clockid_t clock_id;
+
+        usec_t value; /* only for monotonic events */
+        CalendarSpec *calendar_spec; /* only for calendar events */
         usec_t next_elapse;
 
         LIST_FIELDS(struct TimerValue, value);
-
-        TimerBase base;
-        bool disabled;
 } TimerValue;
 
 typedef enum TimerResult {
@@ -66,17 +70,20 @@ struct Timer {
         Unit meta;
 
         LIST_HEAD(TimerValue, values);
-        usec_t next_elapse;
+        usec_t next_elapse_monotonic;
+        usec_t next_elapse_realtime;
 
         TimerState state, deserialized_state;
-        UnitRef unit;
 
-        Watch timer_watch;
+        Watch monotonic_watch;
+        Watch realtime_watch;
 
         TimerResult result;
+
+        usec_t last_trigger_monotonic;
 };
 
-void timer_unit_notify(Unit *u, UnitActiveState new_state);
+void timer_free_values(Timer *t);
 
 extern const UnitVTable timer_vtable;