X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Funit.h;h=c9fd4a538cb2fe7e11c96b7a3097880124cfa4e2;hp=5e61f7c027565deaae223a9ff69fc518fc3e22df;hb=2e22afe909cd5fa003347aa91ad15f0516e5047f;hpb=dfd8eeed3911ce1a4ffc51b9c444f3f18d545040 diff --git a/src/unit.h b/src/unit.h index 5e61f7c02..c9fd4a538 100644 --- a/src/unit.h +++ b/src/unit.h @@ -43,15 +43,6 @@ typedef enum UnitDependency UnitDependency; #define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC) #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC) -typedef enum KillMode { - KILL_CONTROL_GROUP = 0, - KILL_PROCESS_GROUP, - KILL_PROCESS, - KILL_NONE, - _KILL_MODE_MAX, - _KILL_MODE_INVALID = -1 -} KillMode; - enum UnitType { UNIT_SERVICE = 0, UNIT_SOCKET, @@ -78,8 +69,9 @@ enum UnitLoadState { enum UnitActiveState { UNIT_ACTIVE, - UNIT_ACTIVE_RELOADING, + UNIT_RELOADING, UNIT_INACTIVE, + UNIT_MAINTENANCE, UNIT_ACTIVATING, UNIT_DEACTIVATING, _UNIT_ACTIVE_STATE_MAX, @@ -87,15 +79,19 @@ enum UnitActiveState { }; static inline bool UNIT_IS_ACTIVE_OR_RELOADING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_RELOADING; } static inline bool UNIT_IS_ACTIVE_OR_ACTIVATING(UnitActiveState t) { - return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_ACTIVE_RELOADING; + return t == UNIT_ACTIVE || t == UNIT_ACTIVATING || t == UNIT_RELOADING; } static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) { - return t == UNIT_INACTIVE || t == UNIT_DEACTIVATING; + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE || t == UNIT_DEACTIVATING; +} + +static inline bool UNIT_IS_INACTIVE_OR_MAINTENANCE(UnitActiveState t) { + return t == UNIT_INACTIVE || t == UNIT_MAINTENANCE; } enum UnitDependency { @@ -137,9 +133,6 @@ struct Meta { UnitLoadState load_state; Unit *merged_into; - /* Refuse manual starting, allow starting only indirectly via dependency. */ - bool only_by_dependency; - char *id; /* One name is special because we use it for identification. Points to an entry in the names set */ char *instance; @@ -153,10 +146,10 @@ struct Meta { * the job for it */ Job *job; - timestamp inactive_exit_timestamp; - timestamp active_enter_timestamp; - timestamp active_exit_timestamp; - timestamp inactive_enter_timestamp; + dual_timestamp inactive_exit_timestamp; + dual_timestamp active_enter_timestamp; + dual_timestamp active_exit_timestamp; + dual_timestamp inactive_enter_timestamp; /* Counterparts in the cgroup filesystem */ CGroupBonding *cgroup_bondings; @@ -185,6 +178,12 @@ struct Meta { /* Garbage collect us we nobody wants or requires us anymore */ bool stop_when_unneeded; + /* Refuse manual starting, allow starting only indirectly via dependency. */ + bool only_by_dependency; + + /* Create default depedencies */ + bool default_dependencies; + /* When deserializing, temporarily store the job type for this * unit here, if there was a job scheduled */ int deserialized_job; /* This is actually of type JobType */ @@ -285,6 +284,9 @@ struct UnitVTable { * ran empty */ void (*cgroup_notify_empty)(Unit *u); + /* Called whenever a process of this unit sends us a message */ + void (*notify_message)(Unit *u, pid_t pid, char **tags); + /* Called whenever a name thus Unit registered for comes or * goes away. */ void (*bus_name_owner_change)(Unit *u, const char *name, const char *old_owner, const char *new_owner); @@ -293,7 +295,7 @@ struct UnitVTable { void (*bus_query_pid_done)(Unit *u, const char *name, pid_t pid); /* Called for each message received on the bus */ - DBusHandlerResult (*bus_message_handler)(Unit *u, DBusMessage *message); + DBusHandlerResult (*bus_message_handler)(Unit *u, DBusConnection *c, DBusMessage *message); /* This is called for each unit type and should be used to * enumerate existing devices and load them. However, @@ -324,6 +326,9 @@ struct UnitVTable { /* Exclude from isolation requests */ bool no_isolate:1; + + /* Show status updates on the console */ + bool show_status:1; }; extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX]; @@ -333,14 +338,14 @@ extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX]; /* For casting a unit into the various unit types */ #define DEFINE_CAST(UPPERCASE, MixedCase) \ static inline MixedCase* UPPERCASE(Unit *u) { \ - if (!u || u->meta.type != UNIT_##UPPERCASE) \ + if (_unlikely_(!u || u->meta.type != UNIT_##UPPERCASE)) \ return NULL; \ \ return (MixedCase*) u; \ } /* For casting the various unit types into a unit */ -#define UNIT(u) ((Unit*) (u)) +#define UNIT(u) ((Unit*) (&(u)->meta)) DEFINE_CAST(SOCKET, Socket); DEFINE_CAST(TIMER, Timer); @@ -359,8 +364,13 @@ void unit_free(Unit *u); int unit_add_name(Unit *u, const char *name); int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_reference); +int unit_add_two_dependencies(Unit *u, UnitDependency d, UnitDependency e, Unit *other, bool add_reference); + int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, const char *filename, bool add_reference); +int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency e, const char *name, const char *path, bool add_reference); + int unit_add_dependency_by_name_inverse(Unit *u, UnitDependency d, const char *name, const char *filename, bool add_reference); +int unit_add_two_dependencies_by_name_inverse(Unit *u, UnitDependency d, UnitDependency e, const char *name, const char *path, bool add_reference); int unit_add_exec_dependencies(Unit *u, ExecContext *c); @@ -443,6 +453,8 @@ 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, ...); + const char *unit_type_to_string(UnitType i); UnitType unit_type_from_string(const char *s);