X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=unit.h;h=6dfc065c9f36f54888ec3eb729c901712d5c7c94;hp=7ab2ccdfbcef004f7b9d0592094150cd2cda3c42;hb=94f043472a5af62dc9cd5767e89ba33872212d5e;hpb=7824bbebe329eea611b809e2fff3e6df4073a465

diff --git a/unit.h b/unit.h
index 7ab2ccdfb..6dfc065c9 100644
--- a/unit.h
+++ b/unit.h
@@ -14,14 +14,11 @@ typedef enum UnitLoadState UnitLoadState;
 typedef enum UnitActiveState UnitActiveState;
 typedef enum UnitDependency UnitDependency;
 
-#include "job.h"
-#include "manager.h"
 #include "set.h"
 #include "util.h"
 #include "list.h"
 #include "socket-util.h"
 #include "execute.h"
-#include "util.h"
 
 #define UNIT_NAME_MAX 128
 #define DEFAULT_TIMEOUT_USEC (20*USEC_PER_SEC)
@@ -44,7 +41,8 @@ enum UnitLoadState {
         UNIT_STUB,
         UNIT_LOADED,
         UNIT_FAILED,
-        _UNIT_LOAD_STATE_MAX
+        _UNIT_LOAD_STATE_MAX,
+        _UNIT_LOAD_STATE_INVALID = -1
 };
 
 enum UnitActiveState {
@@ -53,7 +51,8 @@ enum UnitActiveState {
         UNIT_INACTIVE,
         UNIT_ACTIVATING,
         UNIT_DEACTIVATING,
-        _UNIT_ACTIVE_STATE_MAX
+        _UNIT_ACTIVE_STATE_MAX,
+        _UNIT_ACTIVE_STATE_INVALID = -1
 };
 
 static inline bool UNIT_IS_ACTIVE_OR_RELOADING(UnitActiveState t) {
@@ -92,6 +91,9 @@ enum UnitDependency {
         _UNIT_DEPENDENCY_INVALID = -1
 };
 
+#include "manager.h"
+#include "job.h"
+
 struct Meta {
         Manager *manager;
         UnitType type;
@@ -111,11 +113,20 @@ struct Meta {
 
         bool in_load_queue:1;
 
+        /* If we go down, pull down everything that depends on us, too */
+        bool recursive_stop;
+
+        /* Garbage collect us we nobody wants or requires us anymore */
+        bool stop_when_unneeded;
+
         usec_t active_enter_timestamp;
         usec_t active_exit_timestamp;
 
         /* Load queue */
         LIST_FIELDS(Meta, load_queue);
+
+        /* Per type list */
+        LIST_FIELDS(Meta, units_per_type);
 };
 
 #include "service.h"
@@ -144,6 +155,7 @@ struct UnitVTable {
 
         int (*init)(Unit *u);
         void (*done)(Unit *u);
+        int (*coldplug)(Unit *u);
 
         void (*dump)(Unit *u, FILE *f, const char *prefix);
 
@@ -161,7 +173,14 @@ 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);
 
+        /* 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
+         * inactive state. It is the job of the coldplug() call above
+         * to put the units into the initial state.  */
         int (*enumerate)(Manager *m);
+
+        /* Type specific cleanups. */
         void (*shutdown)(Manager *m);
 };
 
@@ -201,6 +220,9 @@ int unit_add_name(Unit *u, const char *name);
 int unit_add_dependency(Unit *u, UnitDependency d, Unit *other);
 int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name);
 
+int unit_choose_id(Unit *u, const char *name);
+int unit_set_description(Unit *u, const char *description);
+
 void unit_add_to_load_queue(Unit *u);
 
 int unit_merge(Unit *u, Unit *other);
@@ -238,6 +260,18 @@ bool unit_job_is_applicable(Unit *u, JobType j);
 const char *unit_path(void);
 int set_unit_path(const char *p);
 
-char *unit_name_escape_path(const char *path, const char *suffix);
+char *unit_name_escape_path(const char *prefix, const char *path, const char *suffix);
+
+const char *unit_type_to_string(UnitType i);
+UnitType unit_type_from_string(const char *s);
+
+const char *unit_load_state_to_string(UnitLoadState i);
+UnitLoadState unit_load_state_from_string(const char *s);
+
+const char *unit_active_state_to_string(UnitActiveState i);
+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);
 
 #endif