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

diff --git a/src/core/timer.h b/src/core/timer.h
index c6d1d42e4..3e7efa4c8 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 {
@@ -65,26 +69,31 @@ typedef enum TimerResult {
 struct Timer {
         Unit meta;
 
+        usec_t accuracy_usec;
+
         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;
+        sd_event_source *monotonic_event_source;
+        sd_event_source *realtime_event_source;
 
         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;
 
-const char *timer_state_to_string(TimerState i);
-TimerState timer_state_from_string(const char *s);
+const char *timer_state_to_string(TimerState i) _const_;
+TimerState timer_state_from_string(const char *s) _pure_;
 
-const char *timer_base_to_string(TimerBase i);
-TimerBase timer_base_from_string(const char *s);
+const char *timer_base_to_string(TimerBase i) _const_;
+TimerBase timer_base_from_string(const char *s) _pure_;
 
-const char* timer_result_to_string(TimerResult i);
-TimerResult timer_result_from_string(const char *s);
+const char* timer_result_to_string(TimerResult i) _const_;
+TimerResult timer_result_from_string(const char *s) _pure_;