chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machine-id-setup: casting const away is ugly, let's not do it if there's no reason to
[elogind.git]
/
src
/
core
/
timer.h
diff --git
a/src/core/timer.h
b/src/core/timer.h
index 712cced29682c4a97d6914dfad9155ad7a861df7..de412a043ec65ceff6c3e7fc9229d00dfa97f5f6 100644
(file)
--- a/
src/core/timer.h
+++ b/
src/core/timer.h
@@
-50,7
+50,6
@@
typedef enum TimerBase {
typedef struct TimerValue {
TimerBase base;
bool disabled;
typedef struct TimerValue {
TimerBase base;
bool disabled;
- clockid_t clock_id;
usec_t value; /* only for monotonic events */
CalendarSpec *calendar_spec; /* only for calendar events */
usec_t value; /* only for monotonic events */
CalendarSpec *calendar_spec; /* only for calendar events */
@@
-72,8
+71,9
@@
struct Timer {
usec_t accuracy_usec;
LIST_HEAD(TimerValue, values);
usec_t accuracy_usec;
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;
@@
-83,8
+83,7
@@
struct Timer {
TimerResult result;
bool persistent;
TimerResult result;
bool persistent;
-
- dual_timestamp last_trigger;
+ bool wake_system;
char *stamp_path;
};
char *stamp_path;
};