X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Funit.h;h=626bdc43af6b1a793a99d9f0c6011c93940cffa3;hp=fa869ece8fb7859dbea2def6c055dd1b68632796;hb=7d17cfbc46306a106dbda0f3e92fbc0792d1e9e9;hpb=52661efd21608dc7e0ac26b714a9254ed6180ddb diff --git a/src/unit.h b/src/unit.h index fa869ece8..626bdc43a 100644 --- 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 struct UnitRef UnitRef; #include "set.h" #include "util.h" @@ -39,9 +40,7 @@ typedef enum UnitDependency UnitDependency; #include "socket-util.h" #include "execute.h" #include "condition.h" - -#define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC) -#define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC) +#include "install.h" enum UnitType { UNIT_SERVICE = 0, @@ -102,11 +101,13 @@ enum UnitDependency { 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' */ - UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of 'soft_requires' and 'soft_requisite' is 'soft_required_by' */ + UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of 'requires_overridable' and 'requisite_overridable' is 'soft_required_by' */ UNIT_WANTED_BY, /* inverse of 'wants' */ + UNIT_BOUND_BY, /* inverse of 'bind_to' */ /* Negative dependencies */ UNIT_CONFLICTS, /* inverse of 'conflicts' is 'conflicted_by' */ @@ -119,6 +120,14 @@ enum UnitDependency { /* On Failure */ UNIT_ON_FAILURE, + /* Triggers (i.e. a socket triggers a service) */ + UNIT_TRIGGERS, + UNIT_TRIGGERED_BY, + + /* Propagate reloads */ + UNIT_PROPAGATE_RELOAD_TO, + UNIT_PROPAGATE_RELOAD_FROM, + /* Reference information for GC logic */ UNIT_REFERENCES, /* Inverse of 'references' is 'referenced_by' */ UNIT_REFERENCED_BY, @@ -130,6 +139,7 @@ enum UnitDependency { #include "manager.h" #include "job.h" #include "cgroup.h" +#include "cgroup-attr.h" struct Meta { Manager *manager; @@ -155,9 +165,14 @@ struct Meta { usec_t job_timeout; + /* References to this */ + LIST_HEAD(UnitRef, refs); + /* 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; @@ -165,9 +180,10 @@ struct Meta { /* Counterparts in the cgroup filesystem */ CGroupBonding *cgroup_bondings; + CGroupAttribute *cgroup_attributes; /* Per type list */ - LIST_FIELDS(Meta, units_per_type); + LIST_FIELDS(Meta, units_by_type); /* Load queue */ LIST_FIELDS(Meta, load_queue); @@ -191,18 +207,15 @@ struct Meta { /* 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; + /* Cached unit file state */ + UnitFileState unit_file_state; /* Garbage collect us we nobody wants or requires us anymore */ bool stop_when_unneeded; - /* Create default depedencies */ + /* Create 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; @@ -212,6 +225,18 @@ struct Meta { /* Allow isolation requests */ bool allow_isolate; + /* Isolate OnFailure unit */ + bool on_failure_isolate; + + /* Ignore this unit when isolating */ + bool ignore_on_isolate; + + /* Ignore this unit when snapshotting */ + bool ignore_on_snapshot; + + /* Did the last condition check suceed? */ + bool condition_result; + bool in_load_queue:1; bool in_dbus_queue:1; bool in_cleanup_queue:1; @@ -224,6 +249,15 @@ struct Meta { 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" @@ -252,6 +286,13 @@ union Unit { struct UnitVTable { const char *suffix; + /* How much memory does an object of this unit type need */ + size_t object_size; + + /* 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 @@ -277,6 +318,8 @@ struct UnitVTable { 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 @@ -292,7 +335,7 @@ struct UnitVTable { /* 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); @@ -308,6 +351,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); + /* 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); @@ -331,6 +377,9 @@ struct UnitVTable { /* 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 @@ -352,23 +401,12 @@ struct UnitVTable { /* 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; - /* Exclude this type from snapshots */ - bool no_snapshots:1; - /* Exclude from automatic gc */ bool no_gc:1; - /* Exclude from stopping on isolation requests */ - bool no_isolate:1; - /* Show status updates on the console */ bool show_status:1; }; @@ -400,7 +438,7 @@ DEFINE_CAST(SNAPSHOT, Snapshot); DEFINE_CAST(SWAP, Swap); DEFINE_CAST(PATH, Path); -Unit *unit_new(Manager *m); +Unit *unit_new(Manager *m, size_t size); void unit_free(Unit *u); int unit_add_name(Unit *u, const char *name); @@ -418,8 +456,9 @@ 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_default_cgroup(Unit *u); +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); @@ -458,7 +497,9 @@ int unit_start(Unit *u); int unit_stop(Unit *u); int unit_reload(Unit *u); -void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns); +int unit_kill(Unit *u, KillWho w, KillMode m, int signo, DBusError *error); + +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); @@ -495,7 +536,7 @@ int unit_add_node_link(Unit *u, const char *what, bool wants); 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); @@ -508,9 +549,22 @@ bool unit_pending_active(Unit *u); 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); +void unit_trigger_on_failure(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); @@ -520,7 +574,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 *kill_mode_to_string(KillMode k); -KillMode kill_mode_from_string(const char *s); - #endif