chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: don't do runaway fork()s if we hit a segfault from our segfault handler
[elogind.git]
/
src
/
core
/
timer.h
diff --git
a/src/core/timer.h
b/src/core/timer.h
index c6d1d42e44ea67de069e04168556fbb7ca612b14..4168553e9d977825f88db063ece5552871cb79aa 100644
(file)
--- a/
src/core/timer.h
+++ b/
src/core/timer.h
@@
-24,6
+24,7
@@
typedef struct Timer Timer;
#include "unit.h"
typedef struct Timer Timer;
#include "unit.h"
+#include "calendarspec.h"
typedef enum TimerState {
TIMER_DEAD,
typedef enum TimerState {
TIMER_DEAD,
@@
-41,18
+42,21
@@
typedef enum TimerBase {
TIMER_STARTUP,
TIMER_UNIT_ACTIVE,
TIMER_UNIT_INACTIVE,
TIMER_STARTUP,
TIMER_UNIT_ACTIVE,
TIMER_UNIT_INACTIVE,
+ TIMER_CALENDAR,
_TIMER_BASE_MAX,
_TIMER_BASE_INVALID = -1
} TimerBase;
typedef struct TimerValue {
_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);
usec_t next_elapse;
LIST_FIELDS(struct TimerValue, value);
-
- TimerBase base;
- bool disabled;
} TimerValue;
typedef enum TimerResult {
} TimerValue;
typedef enum TimerResult {
@@
-66,25
+70,28
@@
struct Timer {
Unit meta;
LIST_HEAD(TimerValue, values);
Unit meta;
LIST_HEAD(TimerValue, values);
- usec_t next_elapse;
+ usec_t next_elapse_monotonic;
+ usec_t next_elapse_realtime;
TimerState state, deserialized_state;
TimerState state, deserialized_state;
- UnitRef unit;
- Watch timer_watch;
+ Watch monotonic_watch;
+ Watch realtime_watch;
TimerResult result;
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;
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_
;