X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Ftimer.h;h=c145348c7d82fef19b01e0c01db225e6df87adb4;hp=c6d1d42e44ea67de069e04168556fbb7ca612b14;hb=fea7838e7e0b2724f5e0bc028121a08b42995045;hpb=c2f1db8f83618e60dcded8303d14656d7d26b436;ds=sidebyside

diff --git a/src/core/timer.h b/src/core/timer.h
index c6d1d42e4..c145348c7 100644
--- 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,18 +70,22 @@ 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;
 };
 
 void timer_unit_notify(Unit *u, UnitActiveState new_state);
 
+void timer_free_values(Timer *t);
+
 extern const UnitVTable timer_vtable;
 
 const char *timer_state_to_string(TimerState i);