chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: consolidate service SysV conditionals
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index 3f0ef01c5e871f0f9d9446f3359f8b9f85d929af..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 (60*USEC_PER_SEC)
-#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
-
enum UnitType {
UNIT_SERVICE = 0,
UNIT_SOCKET,
enum UnitType {
UNIT_SERVICE = 0,
UNIT_SOCKET,
@@
-102,11
+99,13
@@
enum UnitDependency {
UNIT_REQUISITE,
UNIT_REQUISITE_OVERRIDABLE,
UNIT_WANTS,
UNIT_REQUISITE,
UNIT_REQUISITE_OVERRIDABLE,
UNIT_WANTS,
+ UNIT_BIND_TO,
/* Inverse of the above */
UNIT_REQUIRED_BY, /* inverse of 'requires' and 'requisite' is 'required_by' */
/* Inverse of the above */
UNIT_REQUIRED_BY, /* inverse of 'requires' and 'requisite' is 'required_by' */
- UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of '
soft_requires' and 'soft_requisit
e' is 'soft_required_by' */
+ UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of '
requires_overridable' and 'requisite_overridabl
e' is 'soft_required_by' */
UNIT_WANTED_BY, /* inverse of 'wants' */
UNIT_WANTED_BY, /* inverse of 'wants' */
+ UNIT_BOUND_BY, /* inverse of 'bind_to' */
/* Negative dependencies */
UNIT_CONFLICTS, /* inverse of 'conflicts' is 'conflicted_by' */
/* Negative dependencies */
UNIT_CONFLICTS, /* inverse of 'conflicts' is 'conflicted_by' */
@@
-158,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;
@@
-191,18
+192,12
@@
struct Meta {
/* Error code when we didn't manage to load the unit (negative) */
int load_error;
/* Error code when we didn't manage to load the unit (negative) */
int load_error;
- /* If we go down, pull down everything that depends on us, too */
- bool recursive_stop;
-
/* 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;
bool default_dependencies;
- /* Bring up this unit even if a dependency fails to start */
- bool ignore_dependency_failure;
-
/* Refuse manual starting, allow starting only indirectly via dependency. */
bool refuse_manual_start;
/* Refuse manual starting, allow starting only indirectly via dependency. */
bool refuse_manual_start;
@@
-212,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;
@@
-294,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);
@@
-333,6
+331,9
@@
struct UnitVTable {
/* Return the unit this unit is following */
Unit *(*following)(Unit *u);
/* Return the unit this unit is following */
Unit *(*following)(Unit *u);
+ /* Return the set of units that are following each other */
+ int (*following_set)(Unit *u, Set **s);
+
/* This is called for each unit type and should be used to
* enumerate existing devices and load them. However,
* everything that is loaded here should still stay in
/* This is called for each unit type and should be used to
* enumerate existing devices and load them. However,
* everything that is loaded here should still stay in
@@
-354,11
+355,6
@@
struct UnitVTable {
/* Can units of this type have multiple names? */
bool no_alias:1;
/* Can units of this type have multiple names? */
bool no_alias:1;
- /* If true units of this types can never have "Requires"
- * dependencies, because state changes can only be observed,
- * not triggered */
- bool no_requires:1;
-
/* Instances make no sense for this type */
bool no_instances:1;
/* Instances make no sense for this type */
bool no_instances:1;
@@
-420,7
+416,7
@@
int unit_add_exec_dependencies(Unit *u, ExecContext *c);
int unit_add_cgroup(Unit *u, CGroupBonding *b);
int unit_add_cgroup_from_text(Unit *u, const char *name);
int unit_add_cgroup(Unit *u, CGroupBonding *b);
int unit_add_cgroup_from_text(Unit *u, const char *name);
-int unit_add_default_cgroup(Unit *u);
+int unit_add_default_cgroup
s
(Unit *u);
CGroupBonding* unit_get_default_cgroup(Unit *u);
int unit_choose_id(Unit *u, const char *name);
CGroupBonding* unit_get_default_cgroup(Unit *u);
int unit_choose_id(Unit *u, const char *name);
@@
-462,7
+458,7
@@
int unit_reload(Unit *u);
int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error);
int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error);
-void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
+void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns
, bool reload_success
);
int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
void unit_unwatch_fd(Unit *u, Watch *w);
int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
void unit_unwatch_fd(Unit *u, Watch *w);
@@
-512,9
+508,15
@@
bool unit_pending_active(Unit *u);
int unit_add_default_target_dependency(Unit *u, Unit *target);
int unit_add_default_target_dependency(Unit *u, Unit *target);
+int unit_following_set(Unit *u, Set **s);
+
UnitType unit_name_to_type(const char *n);
bool unit_name_is_valid(const char *n, bool template_ok);
UnitType unit_name_to_type(const char *n);
bool unit_name_is_valid(const char *n, bool template_ok);
+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);