chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service: pull in sysv facility targets from the sysv units, not the other way round
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index bd60dcb1153b4b6c44e5d3bce2d0b648639b953d..4245f3cf1ca7875b6963fd2566169d98d74f3b30 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-40,9
+40,6
@@
typedef enum UnitDependency UnitDependency;
#include "execute.h"
#include "condition.h"
#include "execute.h"
#include "condition.h"
-#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)
-#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
-
enum UnitType {
UNIT_SERVICE = 0,
UNIT_SOCKET,
enum UnitType {
UNIT_SERVICE = 0,
UNIT_SOCKET,
@@
-160,6
+157,8
@@
struct Meta {
/* Conditions to check */
LIST_HEAD(Condition, conditions);
/* Conditions to check */
LIST_HEAD(Condition, conditions);
+ dual_timestamp condition_timestamp;
+
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;
@@
-196,7
+195,7
@@
struct Meta {
/* Garbage collect us we nobody wants or requires us anymore */
bool stop_when_unneeded;
/* Garbage collect us we nobody wants or requires us anymore */
bool stop_when_unneeded;
- /* Create default depedencies */
+ /* Create default depe
n
dencies */
bool default_dependencies;
/* Refuse manual starting, allow starting only indirectly via dependency. */
bool default_dependencies;
/* Refuse manual starting, allow starting only indirectly via dependency. */
@@
-208,6
+207,9
@@
struct Meta {
/* Allow isolation requests */
bool allow_isolate;
/* Allow isolation requests */
bool allow_isolate;
+ /* Did the last condition check suceed? */
+ bool condition_result;
+
bool in_load_queue:1;
bool in_dbus_queue:1;
bool in_cleanup_queue:1;
bool in_load_queue:1;
bool in_dbus_queue:1;
bool in_cleanup_queue:1;
@@
-290,7
+292,7
@@
struct UnitVTable {
/* Returns the substate specific to this unit type as
* string. This is purely information so that we can give the
/* Returns the substate specific to this unit type as
* string. This is purely information so that we can give the
- * user a more finegrained explanation in which actual state a
+ * user a more fine
grained explanation in which actual state a
* unit is in. */
const char* (*sub_state_to_string)(Unit *u);
* unit is in. */
const char* (*sub_state_to_string)(Unit *u);
@@
-513,6
+515,8
@@
bool unit_name_is_valid(const char *n, bool template_ok);
void unit_trigger_on_failure(Unit *u);
void unit_trigger_on_failure(Unit *u);
+bool unit_condition_test(Unit *u);
+
const char *unit_load_state_to_string(UnitLoadState i);
UnitLoadState unit_load_state_from_string(const char *s);
const char *unit_load_state_to_string(UnitLoadState i);
UnitLoadState unit_load_state_from_string(const char *s);