chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: try to orderly shutdown container when receiving SIGTERM
[elogind.git]
/
src
/
core
/
timer.h
diff --git
a/src/core/timer.h
b/src/core/timer.h
index 985b460ab110f509d73d94d2fcaad691b9afed57..57a514a68c5f7a7dd824afdf018b830949039607 100644
(file)
--- a/
src/core/timer.h
+++ b/
src/core/timer.h
@@
-1,7
+1,6
@@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef footimerhfoo
-#define footimerhfoo
+#pragma once
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-25,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,
@@
-42,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 {
+ TimerBase base;
+ bool disabled;
+ clockid_t clock_id;
+
usec_t value;
usec_t value;
+ CalendarSpec *calendar_spec;
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 {
@@
-67,12
+70,14
@@
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;
UnitRef unit;
TimerState state, deserialized_state;
UnitRef unit;
- Watch timer_watch;
+ Watch monotonic_watch;
+ Watch realtime_watch;
TimerResult result;
};
TimerResult result;
};
@@
-89,5
+94,3
@@
TimerBase timer_base_from_string(const char *s);
const char* timer_result_to_string(TimerResult i);
TimerResult timer_result_from_string(const char *s);
const char* timer_result_to_string(TimerResult i);
TimerResult timer_result_from_string(const char *s);
-
-#endif