X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=manager.h;h=ddc9610e392aab9fb2f654523efdac2065951c00;hb=fd79db6a5df0f94c48736ce5aa0131d6ab108fb0;hp=64c4c9d14cf3b2731ae64dc9ff41467834ed45d3;hpb=87d1515de5ae611e95144def9ef4b2c0c933f6fe;p=elogind.git

diff --git a/manager.h b/manager.h
index 64c4c9d14..ddc9610e3 100644
--- a/manager.h
+++ b/manager.h
@@ -5,8 +5,10 @@
 
 #include <stdbool.h>
 #include <inttypes.h>
+#include <stdio.h>
 
 typedef struct Manager Manager;
+typedef enum ManagerEventType ManagerEventType;
 
 #include "name.h"
 #include "job.h"
@@ -14,6 +16,12 @@ typedef struct Manager Manager;
 #include "list.h"
 #include "set.h"
 
+enum ManagerEventType {
+        MANAGER_SIGNAL,
+        MANAGER_FD,
+        MANAGER_TIMER
+};
+
 struct Manager {
         uint32_t current_job_id;
 
@@ -28,11 +36,20 @@ struct Manager {
         /* Names that need to be loaded */
         LIST_HEAD(Meta, load_queue); /* this is actually more a stack than a queue, but uh. */
 
-        /* Jobs to be added resp. removed. */
-        Hashmap *jobs_to_add;  /* Name object => Job object 1:1 */
-        Set *jobs_to_remove;
+        /* Jobs that need to be run */
+        LIST_HEAD(Job, run_queue);   /* more a stack than a queue, too */
+
+        /* Jobs to be added */
+        Hashmap *transaction_jobs;      /* Name object => Job object list 1:1 */
+        JobDependency *transaction_anchor;
 
         bool dispatching_load_queue:1;
+        bool dispatching_run_queue:1;
+
+        Hashmap *watch_pids;  /* pid => Name object n:1 */
+
+        int epoll_fd;
+        int signal_fd;
 };
 
 Manager* manager_new(void);
@@ -42,6 +59,16 @@ Job *manager_get_job(Manager *m, uint32_t id);
 Name *manager_get_name(Manager *m, const char *name);
 
 int manager_load_name(Manager *m, const char *name, Name **_ret);
-int manager_add_job(Manager *m, JobType job, Name *name, JobMode mode, Job **_ret);
+int manager_add_job(Manager *m, JobType type, Name *name, JobMode mode, bool force, Job **_ret);
+
+void manager_dump_names(Manager *s, FILE *f, const char *prefix);
+void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
+
+void manager_transaction_unlink_job(Manager *m, Job *j);
+
+void manager_clear_jobs(Manager *m);
+
+void manager_dispatch_run_queue(Manager *m);
+int manager_loop(Manager *m);
 
 #endif