chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora: make sure the gettys are run before X starts up
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index 55fe0fa60ec8818ce53fd5e964c3c95bf98e0202..f1171270f8adcc5721018a513802a0d9dde727db 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-143,6
+143,7
@@
struct Meta {
Set *dependencies[_UNIT_DEPENDENCY_MAX];
char *description;
Set *dependencies[_UNIT_DEPENDENCY_MAX];
char *description;
+
char *fragment_path; /* if loaded from a config file this is the primary path to it */
usec_t fragment_mtime;
char *fragment_path; /* if loaded from a config file this is the primary path to it */
usec_t fragment_mtime;
@@
-150,6
+151,8
@@
struct Meta {
* the job for it */
Job *job;
* the job for it */
Job *job;
+ usec_t job_timeout;
+
dual_timestamp inactive_exit_timestamp;
dual_timestamp active_enter_timestamp;
dual_timestamp active_exit_timestamp;
dual_timestamp inactive_exit_timestamp;
dual_timestamp active_enter_timestamp;
dual_timestamp active_exit_timestamp;
@@
-173,6
+176,9
@@
struct Meta {
/* GC queue */
LIST_FIELDS(Meta, gc_queue);
/* GC queue */
LIST_FIELDS(Meta, gc_queue);
+ /* This follows another unit in state */
+ Unit *following;
+
/* Used during GC sweeps */
unsigned gc_marker;
/* Used during GC sweeps */
unsigned gc_marker;
@@
-287,6
+293,9
@@
struct UnitVTable {
void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
+ /* Reset maintenance state if we are in maintainance state */
+ void (*reset_maintenance)(Unit *u);
+
/* Called whenever any of the cgroups this unit watches for
* ran empty */
void (*cgroup_notify_empty)(Unit *u);
/* Called whenever any of the cgroups this unit watches for
* ran empty */
void (*cgroup_notify_empty)(Unit *u);
@@
-464,6
+473,8
@@
void unit_status_printf(Unit *u, const char *format, ...);
bool unit_need_daemon_reload(Unit *u);
bool unit_need_daemon_reload(Unit *u);
+void unit_reset_maintenance(Unit *u);
+
const char *unit_type_to_string(UnitType i);
UnitType unit_type_from_string(const char *s);
const char *unit_type_to_string(UnitType i);
UnitType unit_type_from_string(const char *s);