unit: use weaker dependencies between mount and device units in --user mode

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

diff --git a/src/core/timer.h b/src/core/timer.h
index 57a514a68c5f7a7dd824afdf018b830949039607..9d919e4d3ea85090f6d7da35a4c079a6cd0d21c5 100644 (file)
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -23,7 +23,6 @@
 
 typedef struct Timer Timer;
 
 
 typedef struct Timer Timer;
 

-#include "unit.h"

 #include "calendarspec.h"
 
 typedef enum TimerState {
 #include "calendarspec.h"
 
 typedef enum TimerState {


@@ -50,10 +49,9 @@ typedef enum TimerBase {
 typedef struct TimerValue {
         TimerBase base;
         bool disabled;
 typedef struct TimerValue {
         TimerBase base;
         bool disabled;

-        clockid_t clock_id;

 
 

-        usec_t value;
-        CalendarSpec *calendar_spec;
+        usec_t value; /* only for monotonic events */
+        CalendarSpec *calendar_spec; /* only for calendar events */

         usec_t next_elapse;
 
         LIST_FIELDS(struct TimerValue, value);
         usec_t next_elapse;
 
         LIST_FIELDS(struct TimerValue, value);


@@ -69,28 +67,35 @@ typedef enum TimerResult {
 struct Timer {
         Unit meta;
 
 struct Timer {
         Unit meta;
 

+        usec_t accuracy_usec;
+

         LIST_HEAD(TimerValue, values);
         LIST_HEAD(TimerValue, values);

-        usec_t next_elapse_monotonic;

         usec_t next_elapse_realtime;
         usec_t next_elapse_realtime;

+        usec_t next_elapse_monotonic_or_boottime;
+        dual_timestamp last_trigger;

 
         TimerState state, deserialized_state;
 
         TimerState state, deserialized_state;

-        UnitRef unit;

 
 

-        Watch monotonic_watch;
-        Watch realtime_watch;
+        sd_event_source *monotonic_event_source;
+        sd_event_source *realtime_event_source;

 
         TimerResult result;
 
         TimerResult result;

+
+        bool persistent;
+        bool wake_system;
+
+        char *stamp_path;

 };
 
 };
 

-void timer_unit_notify(Unit *u, UnitActiveState new_state);
+void timer_free_values(Timer *t);

 
 extern const UnitVTable timer_vtable;
 
 
 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_;