chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: show whether we follow somebody in 'status' output
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index e3c0c0f060d3960545c32e52fbb63baae45e6351..605fa3774d8944ec4c27a0d5514dcc408efecfa7 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-39,7
+39,6
@@
typedef enum UnitDependency UnitDependency;
#include "socket-util.h"
#include "execute.h"
#include "socket-util.h"
#include "execute.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)
@@
-61,8
+60,9
@@
enum UnitType {
enum UnitLoadState {
UNIT_STUB,
UNIT_LOADED,
enum UnitLoadState {
UNIT_STUB,
UNIT_LOADED,
- UNIT_
FAILED
,
+ UNIT_
ERROR
,
UNIT_MERGED,
UNIT_MERGED,
+ UNIT_MASKED,
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
};
_UNIT_LOAD_STATE_MAX,
_UNIT_LOAD_STATE_INVALID = -1
};
@@
-71,7
+71,7
@@
enum UnitActiveState {
UNIT_ACTIVE,
UNIT_RELOADING,
UNIT_INACTIVE,
UNIT_ACTIVE,
UNIT_RELOADING,
UNIT_INACTIVE,
- UNIT_
MAINTENANCE
,
+ UNIT_
FAILED
,
UNIT_ACTIVATING,
UNIT_DEACTIVATING,
_UNIT_ACTIVE_STATE_MAX,
UNIT_ACTIVATING,
UNIT_DEACTIVATING,
_UNIT_ACTIVE_STATE_MAX,
@@
-87,11
+87,11
@@
static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) {
}
static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) {
}
static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) {
- return t == UNIT_INACTIVE || t == UNIT_
MAINTENANCE
|| t == UNIT_DEACTIVATING;
+ return t == UNIT_INACTIVE || t == UNIT_
FAILED
|| t == UNIT_DEACTIVATING;
}
}
-static inline bool UNIT_IS_INACTIVE_OR_
MAINTENANCE
(UnitActiveState t) {
- return t == UNIT_INACTIVE || t == UNIT_
MAINTENANCE
;
+static inline bool UNIT_IS_INACTIVE_OR_
FAILED
(UnitActiveState t) {
+ return t == UNIT_INACTIVE || t == UNIT_
FAILED
;
}
enum UnitDependency {
}
enum UnitDependency {
@@
-304,8
+304,8
@@
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);
+ /* Reset
failed state if we are in failed
state */
+ void (*reset_
failed
)(Unit *u);
/* Called whenever any of the cgroups this unit watches for
* ran empty */
/* Called whenever any of the cgroups this unit watches for
* ran empty */
@@
-338,7
+338,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;
@@
-495,10
+495,18
@@
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);
+void unit_reset_
failed
(Unit *u);
Unit *unit_following(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);