implement coldpluggin

[elogind.git] / unit.h

diff --git a/unit.h b/unit.h
index cabf230148d46310a958f47596ec01f1e6d89d52..3e42ebe9006644206a4f77f66cac3342a9c28410 100644 (file)
--- a/unit.h
+++ b/unit.h
@@ -23,7 +23,7 @@ typedef enum UnitDependency UnitDependency;
 #include "execute.h"
 #include "util.h"
 
 #include "execute.h"
 #include "util.h"
 

-#define UNIT_NAME_MAX 32
+#define UNIT_NAME_MAX 128

 #define DEFAULT_TIMEOUT_USEC (20*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 
 #define DEFAULT_TIMEOUT_USEC (20*USEC_PER_SEC)
 #define DEFAULT_RESTART_USEC (100*USEC_PER_MSEC)
 


@@ -144,6 +144,7 @@ struct UnitVTable {
 
         int (*init)(Unit *u);
         void (*done)(Unit *u);
 
         int (*init)(Unit *u);
         void (*done)(Unit *u);

+        int (*coldplug)(Unit *u);

 
         void (*dump)(Unit *u, FILE *f, const char *prefix);
 
 
         void (*dump)(Unit *u, FILE *f, const char *prefix);
 


@@ -157,11 +158,19 @@ struct UnitVTable {
          * a simpler one that the engine can understand */
         UnitActiveState (*active_state)(Unit *u);
 
          * a simpler one that the engine can understand */
         UnitActiveState (*active_state)(Unit *u);
 

-        void (*fd_event)(Unit *u, int fd, uint32_t events);
+        void (*fd_event)(Unit *u, int fd, uint32_t events, Watch *w);

         void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);
         void (*sigchld_event)(Unit *u, pid_t pid, int code, int status);

-        void (*timer_event)(Unit *u, int id, uint64_t n_elapsed);
+        void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);

 
 

-        void (*retry)(Unit *u);
+        /* 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);

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


@@ -198,6 +207,10 @@ void unit_free(Unit *u);
 
 int unit_add_name(Unit *u, const char *name);
 int unit_add_dependency(Unit *u, UnitDependency d, Unit *other);
 
 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);
 
 
 void unit_add_to_load_queue(Unit *u);
 


@@ -222,19 +235,20 @@ int unit_reload(Unit *u);
 
 void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
 
 
 void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns);
 

-int unit_watch_fd(Unit *u, int fd, uint32_t events);
-void unit_unwatch_fd(Unit *u, int fd);
+int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w);
+void unit_unwatch_fd(Unit *u, Watch *w);

 
 int unit_watch_pid(Unit *u, pid_t pid);
 void unit_unwatch_pid(Unit *u, pid_t pid);
 
 
 int unit_watch_pid(Unit *u, pid_t pid);
 void unit_unwatch_pid(Unit *u, pid_t pid);
 

-int unit_watch_timer(Unit *u, usec_t delay, int *id);
-void unit_unwatch_timer(Unit *u, int *id);
+int unit_watch_timer(Unit *u, usec_t delay, Watch *w);
+void unit_unwatch_timer(Unit *u, Watch *w);

 
 bool unit_job_is_applicable(Unit *u, JobType j);
 
 const char *unit_path(void);
 int set_unit_path(const char *p);
 
 
 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 *prefix, const char *path, const char *suffix);

 
 #endif
 
 #endif