X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.h;h=129601164aa28c6555d13a6f4f0b4bac1931d219;hp=f337307f04df72261925c07e8b68d266747d91f1;hb=44d8db9e5aa86165c97289f6c78a7e42bac78362;hpb=e5b5ae50f02d7814f37b15329da2adce0fb30825

diff --git a/job.h b/job.h
index f337307f0..129601164 100644
--- a/job.h
+++ b/job.h
@@ -9,8 +9,8 @@
 typedef struct Job Job;
 typedef struct JobDependency JobDependency;
 typedef enum JobType JobType;
-typedef enum JobMode JobMode;
 typedef enum JobState JobState;
+typedef enum JobMode JobMode;
 
 #include "manager.h"
 #include "name.h"
@@ -18,13 +18,20 @@ typedef enum JobState JobState;
 #include "list.h"
 
 enum JobType {
-        JOB_START,
+        JOB_START,                  /* if a name does not support being started, we'll just wait until it becomes active */
+        JOB_VERIFY_ACTIVE,
+
         JOB_STOP,
-        JOB_VERIFY_STARTED,
-        JOB_RELOAD,          /* reload if running */
-        JOB_RELOAD_OR_START, /* reload if running, start if not running */
-        JOB_RESTART,         /* stop if running, then start unconditionally */
-        JOB_TRY_RESTART,     /* stop and start if running */
+
+        JOB_RELOAD,                 /* if running reload */
+        JOB_RELOAD_OR_START,        /* if running reload, if not running start */
+
+        /* Note that restarts are first treated like JOB_STOP, but
+         * then instead of finishing are patched to become
+         * JOB_START. */
+        JOB_RESTART,                /* if running stop, then start unconditionally */
+        JOB_TRY_RESTART,            /* if running stop and then start */
+
         _JOB_TYPE_MAX,
         _JOB_TYPE_INVALID = -1
 };
@@ -32,7 +39,6 @@ enum JobType {
 enum JobState {
         JOB_WAITING,
         JOB_RUNNING,
-        JOB_DONE,
         _JOB_STATE_MAX
 };
 
@@ -50,9 +56,8 @@ struct JobDependency {
 
         bool matters;
 
-        /* Linked list for the subjects, resp objects */
-        JobDependency *subject_prev, *subject_next;
-        JobDependency *object_prev, *object_next;
+        LIST_FIELDS(JobDependency, subject);
+        LIST_FIELDS(JobDependency, object);
 };
 
 struct Job {
@@ -65,22 +70,25 @@ struct Job {
         JobState state;
 
         bool linked:1;
+        bool in_run_queue:1;
         bool matters_to_anchor:1;
+        bool forced:1;
 
-        /* These fields are used only while building a transaction */
-        Job *transaction_next, *transaction_prev;
+        LIST_FIELDS(Job, transaction);
+        LIST_FIELDS(Job, run_queue);
 
-        JobDependency *subject_list;
-        JobDependency *object_list;
+        LIST_HEAD(JobDependency, subject_list);
+        LIST_HEAD(JobDependency, object_list);
 
-        /* used for graph algs as a "I have been here" marker */
+        /* Used for graph algs as a "I have been here" marker */
         Job* marker;
         unsigned generation;
+
 };
 
 Job* job_new(Manager *m, JobType type, Name *name);
 void job_free(Job *job);
-void job_dump(Job *j, FILE*f);
+void job_dump(Job *j, FILE*f, const char *prefix);
 
 JobDependency* job_dependency_new(Job *subject, Job *object, bool matters);
 void job_dependency_free(JobDependency *l);
@@ -90,4 +98,14 @@ bool job_is_anchor(Job *j);
 
 int job_merge(Job *j, Job *other);
 
+const char* job_type_to_string(JobType t);
+int job_type_merge(JobType *a, JobType b);
+bool job_type_is_mergeable(JobType a, JobType b);
+bool job_type_is_superset(JobType a, JobType b);
+bool job_type_is_conflicting(JobType a, JobType b);
+
+void job_schedule_run(Job *j);
+int job_run_and_invalidate(Job *j);
+int job_finish_and_invalidate(Job *j, bool success);
+
 #endif