unit: avoid re-definition of enum for older gcc versions

[elogind.git] / src / core / unit.h

diff --git a/src/core/unit.h b/src/core/unit.h
index 1b777bfaab066dbe5040036447413486378d87fb..61a85d7bee9ade6cd1f1c077898ed7707b62dd9a 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -27,11 +27,10 @@
 
 typedef struct Unit Unit;
 typedef struct UnitVTable UnitVTable;
 
 typedef struct Unit Unit;
 typedef struct UnitVTable UnitVTable;

-typedef enum UnitType UnitType;
-typedef enum UnitLoadState UnitLoadState;

 typedef enum UnitActiveState UnitActiveState;
 typedef enum UnitDependency UnitDependency;
 typedef struct UnitRef UnitRef;
 typedef enum UnitActiveState UnitActiveState;
 typedef enum UnitDependency UnitDependency;
 typedef struct UnitRef UnitRef;

+typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;

 
 #include "set.h"
 #include "util.h"
 
 #include "set.h"
 #include "util.h"


@@ -40,31 +39,7 @@ typedef struct UnitRef UnitRef;
 #include "execute.h"
 #include "condition.h"
 #include "install.h"
 #include "execute.h"
 #include "condition.h"
 #include "install.h"

-
-enum UnitType {
-        UNIT_SERVICE = 0,
-        UNIT_SOCKET,
-        UNIT_TARGET,
-        UNIT_DEVICE,
-        UNIT_MOUNT,
-        UNIT_AUTOMOUNT,
-        UNIT_SNAPSHOT,
-        UNIT_TIMER,
-        UNIT_SWAP,
-        UNIT_PATH,
-        _UNIT_TYPE_MAX,
-        _UNIT_TYPE_INVALID = -1
-};
-
-enum UnitLoadState {
-        UNIT_STUB,
-        UNIT_LOADED,
-        UNIT_ERROR,
-        UNIT_MERGED,
-        UNIT_MASKED,
-        _UNIT_LOAD_STATE_MAX,
-        _UNIT_LOAD_STATE_INVALID = -1
-};
+#include "unit-name.h"

 
 enum UnitActiveState {
         UNIT_ACTIVE,
 
 enum UnitActiveState {
         UNIT_ACTIVE,


@@ -100,13 +75,13 @@ enum UnitDependency {
         UNIT_REQUISITE,
         UNIT_REQUISITE_OVERRIDABLE,
         UNIT_WANTS,
         UNIT_REQUISITE,
         UNIT_REQUISITE_OVERRIDABLE,
         UNIT_WANTS,

-        UNIT_BIND_TO,
+        UNIT_BINDS_TO,

 
         /* Inverse of the above */
         UNIT_REQUIRED_BY,             /* inverse of 'requires' and 'requisite' is 'required_by' */
         UNIT_REQUIRED_BY_OVERRIDABLE, /* inverse of 'requires_overridable' and 'requisite_overridable' is 'soft_required_by' */
         UNIT_WANTED_BY,               /* inverse of 'wants' */
 
         /* Inverse of the above */
         UNIT_REQUIRED_BY,             /* inverse of 'requires' and 'requisite' is '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' */
+        UNIT_BOUND_BY,                /* inverse of 'binds_to' */

 
         /* Negative dependencies */
         UNIT_CONFLICTS,               /* inverse of 'conflicts' is 'conflicted_by' */
 
         /* Negative dependencies */
         UNIT_CONFLICTS,               /* inverse of 'conflicts' is 'conflicted_by' */


@@ -124,8 +99,8 @@ enum UnitDependency {
         UNIT_TRIGGERED_BY,
 
         /* Propagate reloads */
         UNIT_TRIGGERED_BY,
 
         /* Propagate reloads */

-        UNIT_PROPAGATE_RELOAD_TO,
-        UNIT_PROPAGATE_RELOAD_FROM,
+        UNIT_PROPAGATES_RELOAD_TO,
+        UNIT_RELOAD_PROPAGATED_FROM,

 
         /* Reference information for GC logic */
         UNIT_REFERENCES,              /* Inverse of 'references' is 'referenced_by' */
 
         /* Reference information for GC logic */
         UNIT_REFERENCES,              /* Inverse of 'references' is 'referenced_by' */


@@ -153,15 +128,22 @@ struct Unit {
         Set *names;
         Set *dependencies[_UNIT_DEPENDENCY_MAX];
 
         Set *names;
         Set *dependencies[_UNIT_DEPENDENCY_MAX];
 

+        char **requires_mounts_for;
+

         char *description;
         char *description;

+        char **documentation;

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

+        char *source_path; /* if converted, the source file */

         usec_t fragment_mtime;
         usec_t fragment_mtime;

+        usec_t source_mtime;

 
 

-        /* If there is something to do with this unit, then this is
-         * the job for it */
+        /* If there is something to do with this unit, then this is the installed job for it */

         Job *job;
 
         Job *job;
 

+        /* JOB_NOP jobs are special and can be installed without disturbing the real job. */
+        Job *nop_job;
+

         usec_t job_timeout;
 
         /* References to this */
         usec_t job_timeout;
 
         /* References to this */


@@ -184,6 +166,9 @@ struct Unit {
         /* Per type list */
         LIST_FIELDS(Unit, units_by_type);
 
         /* Per type list */
         LIST_FIELDS(Unit, units_by_type);
 

+        /* All units which have requires_mounts_for set */
+        LIST_FIELDS(Unit, has_requires_mounts_for);
+

         /* Load queue */
         LIST_FIELDS(Unit, load_queue);
 
         /* Load queue */
         LIST_FIELDS(Unit, load_queue);
 


@@ -259,6 +244,12 @@ struct UnitRef {
         LIST_FIELDS(UnitRef, refs);
 };
 
         LIST_FIELDS(UnitRef, refs);
 };
 

+struct UnitStatusMessageFormats {
+        const char *starting_stopping[2];
+        const char *finished_start_job[_JOB_RESULT_MAX];
+        const char *finished_stop_job[_JOB_RESULT_MAX];
+};
+

 #include "service.h"
 #include "timer.h"
 #include "socket.h"
 #include "service.h"
 #include "timer.h"
 #include "socket.h"


@@ -271,8 +262,6 @@ struct UnitRef {
 #include "path.h"
 
 struct UnitVTable {
 #include "path.h"
 
 struct UnitVTable {

-        const char *suffix;
-

         /* How much memory does an object of this unit type need */
         size_t object_size;
 
         /* How much memory does an object of this unit type need */
         size_t object_size;
 


@@ -338,9 +327,6 @@ 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);
 


@@ -385,6 +371,8 @@ struct UnitVTable {
         /* The interface name */
         const char *bus_interface;
 
         /* The interface name */
         const char *bus_interface;
 

+        UnitStatusMessageFormats status_message_formats;
+

         /* Can units of this type have multiple names? */
         bool no_alias:1;
 
         /* Can units of this type have multiple names? */
         bool no_alias:1;
 


@@ -393,9 +381,6 @@ struct UnitVTable {
 
         /* Exclude from automatic gc */
         bool no_gc:1;
 
         /* Exclude from automatic gc */
         bool no_gc: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];


@@ -538,9 +523,6 @@ int unit_add_default_target_dependency(Unit *u, Unit *target);
 
 int unit_following_set(Unit *u, Set **s);
 
 
 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);
 void unit_trigger_on_failure(Unit *u);
 
 bool unit_condition_test(Unit *u);


@@ -552,8 +534,8 @@ void unit_ref_unset(UnitRef *ref);
 
 #define UNIT_DEREF(ref) ((ref).unit)
 
 
 #define UNIT_DEREF(ref) ((ref).unit)
 

-const char *unit_load_state_to_string(UnitLoadState i);
-UnitLoadState unit_load_state_from_string(const char *s);
+int unit_add_one_mount_link(Unit *u, Mount *m);
+int unit_add_mount_links(Unit *u);

 
 const char *unit_active_state_to_string(UnitActiveState i);
 UnitActiveState unit_active_state_from_string(const char *s);
 
 const char *unit_active_state_to_string(UnitActiveState i);
 UnitActiveState unit_active_state_from_string(const char *s);