job: also trigger on-failure dependencies when jobs faile due to dependencies, timeout

[elogind.git] / src / unit.h

diff --git a/src/unit.h b/src/unit.h
index 03031892d0f33f8b5477218d01db5a18a356603e..bd60dcb1153b4b6c44e5d3bce2d0b648639b953d 100644 (file)
--- a/src/unit.h
+++ b/src/unit.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/

 
 #ifndef foounithfoo
 #define foounithfoo
 
 #ifndef foounithfoo
 #define foounithfoo


@@ -38,20 +38,11 @@ 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 128
-#define DEFAULT_TIMEOUT_USEC (60*USEC_PER_SEC)
+#define DEFAULT_TIMEOUT_USEC (3*USEC_PER_MINUTE)

 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 
 #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,
 enum UnitType {
         UNIT_SERVICE = 0,
         UNIT_SOCKET,


@@ -70,17 +61,18 @@ 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
 };
 
 enum UnitActiveState {
         UNIT_ACTIVE,
         _UNIT_LOAD_STATE_MAX,
         _UNIT_LOAD_STATE_INVALID = -1
 };
 
 enum UnitActiveState {
         UNIT_ACTIVE,

-        UNIT_ACTIVE_RELOADING,
+        UNIT_RELOADING,

         UNIT_INACTIVE,
         UNIT_INACTIVE,

-        UNIT_INACTIVE_MAINTENANCE,
+        UNIT_FAILED,

         UNIT_ACTIVATING,
         UNIT_DEACTIVATING,
         _UNIT_ACTIVE_STATE_MAX,
         UNIT_ACTIVATING,
         UNIT_DEACTIVATING,
         _UNIT_ACTIVE_STATE_MAX,


@@ -88,19 +80,19 @@ enum UnitActiveState {
 };
 
 static inline bool UNIT_IS_ACTIVE_OR_RELOADING(UnitActiveState t) {
 };
 
 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) {
 }
 
 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) {
 }
 
 static inline bool UNIT_IS_INACTIVE_OR_DEACTIVATING(UnitActiveState t) {

-        return t == UNIT_INACTIVE || t == UNIT_INACTIVE_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_INACTIVE_MAINTENANCE;
+static inline bool UNIT_IS_INACTIVE_OR_FAILED(UnitActiveState t) {
+        return t == UNIT_INACTIVE || t == UNIT_FAILED;

 }
 
 enum UnitDependency {
 }
 
 enum UnitDependency {


@@ -110,19 +102,25 @@ 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_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_WANTED_BY,               /* inverse of 'wants' */

+        UNIT_BOUND_BY,                /* inverse of 'bind_to' */

 
         /* Negative dependencies */
 
         /* Negative dependencies */

-        UNIT_CONFLICTS,               /* inverse of 'conflicts' is 'conflicts' */
+        UNIT_CONFLICTS,               /* inverse of 'conflicts' is 'conflicted_by' */
+        UNIT_CONFLICTED_BY,

 
         /* Order */
         UNIT_BEFORE,                  /* inverse of 'before' is 'after' and vice versa */
         UNIT_AFTER,
 
 
         /* Order */
         UNIT_BEFORE,                  /* inverse of 'before' is 'after' and vice versa */
         UNIT_AFTER,
 

+        /* On Failure */
+        UNIT_ON_FAILURE,
+

         /* 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,


@@ -142,9 +140,6 @@ struct Meta {
         UnitLoadState load_state;
         Unit *merged_into;
 
         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;
 
         char *id; /* One name is special because we use it for identification. Points to an entry in the names set */
         char *instance;
 


@@ -152,12 +147,19 @@ struct Meta {
         Set *dependencies[_UNIT_DEPENDENCY_MAX];
 
         char *description;
         Set *dependencies[_UNIT_DEPENDENCY_MAX];
 
         char *description;

+

         char *fragment_path; /* if loaded from a config file this is the primary path to it */
         char *fragment_path; /* if loaded from a config file this is the primary path to it */

+        usec_t fragment_mtime;

 
         /* If there is something to do with this unit, then this is
          * the job for it */
         Job *job;
 
 
         /* If there is something to do with this unit, then this is
          * the job for it */
         Job *job;
 

+        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;


@@ -184,15 +186,27 @@ struct Meta {
         /* Used during GC sweeps */
         unsigned gc_marker;
 
         /* Used during GC sweeps */
         unsigned gc_marker;
 

-        /* If we go down, pull down everything that depends on us, too */
-        bool recursive_stop;
+        /* 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 */
+
+        /* Error code when we didn't manage to load the unit (negative) */
+        int load_error;

 
         /* 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;
 

-        /* 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 */
+        /* Create default depedencies */
+        bool default_dependencies;
+
+        /* Refuse manual starting, allow starting only indirectly via dependency. */
+        bool refuse_manual_start;
+
+        /* Don't allow the user to stop this unit manually, allow stopping only indirectly via dependency. */
+        bool refuse_manual_stop;
+
+        /* Allow isolation requests */
+        bool allow_isolate;

 
         bool in_load_queue:1;
         bool in_dbus_queue:1;
 
         bool in_load_queue:1;
         bool in_dbus_queue:1;


@@ -200,6 +214,10 @@ struct Meta {
         bool in_gc_queue:1;
 
         bool sent_dbus_new_signal:1;
         bool in_gc_queue:1;
 
         bool sent_dbus_new_signal:1;

+
+        bool no_gc:1;
+
+        bool in_audit:1;

 };
 
 #include "service.h"
 };
 
 #include "service.h"


@@ -255,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


@@ -286,6 +306,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);
 

+        /* 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 */
         void (*cgroup_notify_empty)(Unit *u);
         /* Called whenever any of the cgroups this unit watches for
          * ran empty */
         void (*cgroup_notify_empty)(Unit *u);


@@ -303,6 +326,12 @@ struct UnitVTable {
         /* Called for each message received on the bus */
         DBusHandlerResult (*bus_message_handler)(Unit *u, DBusConnection *c, DBusMessage *message);
 
         /* Called for each message received on the bus */
         DBusHandlerResult (*bus_message_handler)(Unit *u, DBusConnection *c, DBusMessage *message);
 

+        /* 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
         /* 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


@@ -313,14 +342,17 @@ struct UnitVTable {
         /* Type specific cleanups. */
         void (*shutdown)(Manager *m);
 
         /* Type specific cleanups. */
         void (*shutdown)(Manager *m);
 

+        /* When sending out PropertiesChanged signal, which properties
+         * shall be invalidated? This is a NUL separated list of
+         * strings, to minimize relocations a little. */
+        const char *bus_invalidating_properties;
+
+        /* The interface name */
+        const char *bus_interface;
+

         /* Can units of this type have multiple names? */
         bool no_alias:1;
 
         /* 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;
 
         /* Instances make no sense for this type */
         bool no_instances:1;
 


@@ -330,8 +362,11 @@ struct UnitVTable {
         /* Exclude from automatic gc */
         bool no_gc:1;
 
         /* Exclude from automatic gc */
         bool no_gc:1;
 

-        /* Exclude from isolation requests */
+        /* Exclude from stopping on isolation requests */

         bool no_isolate:1;
         bool no_isolate:1;

+
+        /* Show status updates on the console */
+        bool show_status:1;

 };
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
 };
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];


@@ -367,14 +402,19 @@ 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_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_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_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);
 
 int unit_add_cgroup(Unit *u, CGroupBonding *b);
 int unit_add_cgroup_from_text(Unit *u, const char *name);
 
 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_choose_id(Unit *u, const char *name);
 CGroupBonding* unit_get_default_cgroup(Unit *u);
 
 int unit_choose_id(Unit *u, const char *name);


@@ -394,7 +434,6 @@ Unit *unit_follow_merge(Unit *u);
 
 int unit_load_fragment_and_dropin(Unit *u);
 int unit_load_fragment_and_dropin_optional(Unit *u);
 
 int unit_load_fragment_and_dropin(Unit *u);
 int unit_load_fragment_and_dropin_optional(Unit *u);

-int unit_load_nop(Unit *u);

 int unit_load(Unit *unit);
 
 const char *unit_description(Unit *u);
 int unit_load(Unit *unit);
 
 const char *unit_description(Unit *u);


@@ -409,12 +448,15 @@ void unit_dump(Unit *u, FILE *f, const char *prefix);
 
 bool unit_can_reload(Unit *u);
 bool unit_can_start(Unit *u);
 
 bool unit_can_reload(Unit *u);
 bool unit_can_start(Unit *u);

+bool unit_can_isolate(Unit *u);

 
 int unit_start(Unit *u);
 int unit_stop(Unit *u);
 int unit_reload(Unit *u);
 
 
 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);
 
 int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
 void unit_unwatch_fd(Unit *u, Watch *w);


@@ -451,8 +493,25 @@ int unit_add_node_link(Unit *u, const char *what, bool wants);
 
 int unit_coldplug(Unit *u);
 
 
 int unit_coldplug(Unit *u);
 

-const char *unit_type_to_string(UnitType i);
-UnitType unit_type_from_string(const char *s);
+void unit_status_printf(Unit *u, const char *format, ...);
+
+bool unit_need_daemon_reload(Unit *u);
+
+void unit_reset_failed(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);
+
+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);

 
 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);


@@ -463,7 +522,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