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: fix parsing of Socket= setting
[elogind.git]
/
src
/
unit.h
diff --git
a/src/unit.h
b/src/unit.h
index 1c8cf6387018efed910bcb6353bf3b5498556382..4d83309591776f772d6d51064480cf618965be7d 100644
(file)
--- a/
src/unit.h
+++ b/
src/unit.h
@@
-32,6
+32,7
@@
typedef enum UnitType UnitType;
typedef enum UnitLoadState UnitLoadState;
typedef enum UnitActiveState UnitActiveState;
typedef enum UnitDependency UnitDependency;
typedef enum UnitLoadState UnitLoadState;
typedef enum UnitActiveState UnitActiveState;
typedef enum UnitDependency UnitDependency;
+typedef struct UnitRef UnitRef;
#include "set.h"
#include "util.h"
#include "set.h"
#include "util.h"
@@
-39,6
+40,7
@@
typedef enum UnitDependency UnitDependency;
#include "socket-util.h"
#include "execute.h"
#include "condition.h"
#include "socket-util.h"
#include "execute.h"
#include "condition.h"
+#include "install.h"
enum UnitType {
UNIT_SERVICE = 0,
enum UnitType {
UNIT_SERVICE = 0,
@@
-118,6
+120,10
@@
enum UnitDependency {
/* On Failure */
UNIT_ON_FAILURE,
/* On Failure */
UNIT_ON_FAILURE,
+ /* Triggers (i.e. a socket triggers a service) */
+ UNIT_TRIGGERS,
+ UNIT_TRIGGERED_BY,
+
/* Reference information for GC logic */
UNIT_REFERENCES, /* Inverse of 'references' is 'referenced_by' */
UNIT_REFERENCED_BY,
/* Reference information for GC logic */
UNIT_REFERENCES, /* Inverse of 'references' is 'referenced_by' */
UNIT_REFERENCED_BY,
@@
-129,6
+135,7
@@
enum UnitDependency {
#include "manager.h"
#include "job.h"
#include "cgroup.h"
#include "manager.h"
#include "job.h"
#include "cgroup.h"
+#include "cgroup-attr.h"
struct Meta {
Manager *manager;
struct Meta {
Manager *manager;
@@
-154,6
+161,9
@@
struct Meta {
usec_t job_timeout;
usec_t job_timeout;
+ /* References to this */
+ LIST_HEAD(UnitRef, refs);
+
/* Conditions to check */
LIST_HEAD(Condition, conditions);
/* Conditions to check */
LIST_HEAD(Condition, conditions);
@@
-166,6
+176,7
@@
struct Meta {
/* Counterparts in the cgroup filesystem */
CGroupBonding *cgroup_bondings;
/* Counterparts in the cgroup filesystem */
CGroupBonding *cgroup_bondings;
+ CGroupAttribute *cgroup_attributes;
/* Per type list */
LIST_FIELDS(Meta, units_by_type);
/* Per type list */
LIST_FIELDS(Meta, units_by_type);
@@
-192,6
+203,9
@@
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;
+ /* Cached unit file state */
+ UnitFileState unit_file_state;
+
/* 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;
@@
-231,6
+245,15
@@
struct Meta {
bool in_audit:1;
};
bool in_audit:1;
};
+struct UnitRef {
+ /* Keeps tracks of references to a unit. This is useful so
+ * that we can merge two units if necessary and correct all
+ * references to them */
+
+ Unit* unit;
+ LIST_FIELDS(UnitRef, refs);
+};
+
#include "service.h"
#include "timer.h"
#include "socket.h"
#include "service.h"
#include "timer.h"
#include "socket.h"
@@
-259,6
+282,10
@@
union Unit {
struct UnitVTable {
const char *suffix;
struct UnitVTable {
const char *suffix;
+ /* Config file sections this unit type understands, separated
+ * by NUL chars */
+ const char *sections;
+
/* This should reset all type-specific variables. This should
* not allocate memory, and is called with zero-initialized
* data. It should hence only initialize variables that need
/* This should reset all type-specific variables. This should
* not allocate memory, and is called with zero-initialized
* data. It should hence only initialize variables that need
@@
-317,6
+344,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);
+ /* Check whether unit needs a daemon reload */
+ bool (*need_daemon_reload)(Unit *u);
+
/* Reset failed state if we are in failed state */
void (*reset_failed)(Unit *u);
/* Reset failed state if we are in failed state */
void (*reset_failed)(Unit *u);
@@
-421,6
+451,7
@@
int unit_add_cgroup(Unit *u, CGroupBonding *b);
int unit_add_cgroup_from_text(Unit *u, const char *name);
int unit_add_default_cgroups(Unit *u);
CGroupBonding* unit_get_default_cgroup(Unit *u);
int unit_add_cgroup_from_text(Unit *u, const char *name);
int unit_add_default_cgroups(Unit *u);
CGroupBonding* unit_get_default_cgroup(Unit *u);
+int unit_add_cgroup_attribute(Unit *u, const char *controller, const char *name, const char *value, CGroupAttributeMapCallback map_callback);
int unit_choose_id(Unit *u, const char *name);
int unit_set_description(Unit *u, const char *description);
int unit_choose_id(Unit *u, const char *name);
int unit_set_description(Unit *u, const char *description);
@@
-498,7
+529,7
@@
int unit_add_node_link(Unit *u, const char *what, bool wants);
int unit_coldplug(Unit *u);
int unit_coldplug(Unit *u);
-void unit_status_printf(Unit *u, const char *format, ...);
+void unit_status_printf(Unit *u, const char *
status, const char *
format, ...);
bool unit_need_daemon_reload(Unit *u);
bool unit_need_daemon_reload(Unit *u);
@@
-520,6
+551,13
@@
void unit_trigger_on_failure(Unit *u);
bool unit_condition_test(Unit *u);
bool unit_condition_test(Unit *u);
+UnitFileState unit_get_unit_file_state(Unit *u);
+
+Unit* unit_ref_set(UnitRef *ref, Unit *u);
+void unit_ref_unset(UnitRef *ref);
+
+#define UNIT_DEREF(ref) ((ref).unit)
+
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);