chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load-fragment: properly do comparison of words
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index c85d968b809d5aaa4714866beeaca469ad04a797..796aee5b5c69fcf4e954c6bd43700f0a0667ef99 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-38,8
+38,8
@@
typedef enum UnitDependency UnitDependency;
#include "list.h"
#include "socket-util.h"
#include "execute.h"
#include "list.h"
#include "socket-util.h"
#include "execute.h"
+#include "condition.h"
-#define UNIT_NAME_MAX 256
#define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC)
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
#define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC)
#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
@@
-63,6
+63,7
@@
enum UnitLoadState {
UNIT_LOADED,
UNIT_ERROR,
UNIT_MERGED,
UNIT_LOADED,
UNIT_ERROR,
UNIT_MERGED,
+ UNIT_MASKED,
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
};
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
};
@@
-101,11
+102,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' */
@@
-154,6
+157,9
@@
struct Meta {
usec_t job_timeout;
usec_t job_timeout;
+ /* Conditions to check */
+ LIST_HEAD(Condition, conditions);
+
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;
@@
-187,18
+193,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;
/* Create default depedencies */
bool default_dependencies;
/* Garbage collect us we nobody wants or requires us anymore */
bool stop_when_unneeded;
/* Create default depedencies */
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;
@@
-273,6
+273,8
@@
struct UnitVTable {
int (*stop)(Unit *u);
int (*reload)(Unit *u);
int (*stop)(Unit *u);
int (*reload)(Unit *u);
+ int (*kill)(Unit *u, KillWho w, KillMode m, int signo, DBusError *error);
+
bool (*can_reload)(Unit *u);
/* Write all data that cannot be restored from other sources
bool (*can_reload)(Unit *u);
/* Write all data that cannot be restored from other sources
@@
-338,7
+340,7
@@
struct UnitVTable {
void (*shutdown)(Manager *m);
/* When sending out PropertiesChanged signal, which properties
void (*shutdown)(Manager *m);
/* When sending out PropertiesChanged signal, which properties
- * shall be invalidated? This is a NUL sep
e
rated list of
+ * shall be invalidated? This is a NUL sep
a
rated list of
* strings, to minimize relocations a little. */
const char *bus_invalidating_properties;
* strings, to minimize relocations a little. */
const char *bus_invalidating_properties;
@@
-454,6
+456,8
@@
int unit_start(Unit *u);
int unit_stop(Unit *u);
int unit_reload(Unit *u);
int unit_stop(Unit *u);
int unit_reload(Unit *u);
+int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error);
+
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
@@
-500,6
+504,12
@@
void unit_reset_failed(Unit *u);
Unit *unit_following(Unit *u);
bool unit_pending_inactive(Unit *u);
Unit *unit_following(Unit *u);
bool unit_pending_inactive(Unit *u);
+bool unit_pending_active(Unit *u);
+
+int unit_add_default_target_dependency(Unit *u, Unit *target);
+
+UnitType unit_name_to_type(const char *n);
+bool unit_name_is_valid(const char *n, bool template_ok);
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);
@@
-510,7
+520,4
@@
UnitActiveState unit_active_state_from_string(const char *s);
const char *unit_dependency_to_string(UnitDependency i);
UnitDependency unit_dependency_from_string(const char *s);
const char *unit_dependency_to_string(UnitDependency i);
UnitDependency unit_dependency_from_string(const char *s);
-const char *kill_mode_to_string(KillMode k);
-KillMode kill_mode_from_string(const char *s);
-
#endif
#endif