X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=unit.h;h=a90baf022af5541fe82752fccec10727359616c2;hb=ab6e5f147eb9fa303653ef664f79048110d4a12b;hp=cabf230148d46310a958f47596ec01f1e6d89d52;hpb=0301abf48ed3be921c33d409c73b554435cf6378;p=elogind.git

diff --git a/unit.h b/unit.h
index cabf23014..a90baf022 100644
--- a/unit.h
+++ b/unit.h
@@ -157,11 +157,9 @@ struct UnitVTable {
          * 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 (*timer_event)(Unit *u, int id, uint64_t n_elapsed);
-
-        void (*retry)(Unit *u);
+        void (*timer_event)(Unit *u, uint64_t n_elapsed, Watch *w);
 };
 
 extern const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX];
@@ -222,14 +220,14 @@ int unit_reload(Unit *u);
 
 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_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);