X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.h;h=f1a588cbc9f916f2f9cc97d5c120e445364de6fa;hp=0cb0a6e812e66ceb617c907ac45bbab53d4e6639;hb=94f043472a5af62dc9cd5767e89ba33872212d5e;hpb=11dd41ce4b465f6260ce68aa050a488f88f694eb

diff --git a/job.h b/job.h
index 0cb0a6e81..f1a588cbc 100644
--- a/job.h
+++ b/job.h
@@ -7,31 +7,41 @@
 #include <inttypes.h>
 
 typedef struct Job Job;
+typedef struct JobDependency JobDependency;
 typedef enum JobType JobType;
+typedef enum JobState JobState;
 typedef enum JobMode JobMode;
 
 #include "manager.h"
-#include "name.h"
+#include "unit.h"
 #include "hashmap.h"
 #include "list.h"
 
 enum JobType {
-        JOB_START,
+        JOB_START,                  /* if a unit does not support being started, we'll just wait until it becomes active */
+        JOB_VERIFY_ACTIVE,
+
         JOB_STOP,
-        JOB_VERIFY_STARTED,
-        JOB_RELOAD,
-        JOB_RESTART,
-        JOB_TRY_RESTART, /* restart if running */
-        JOB_RESTART_FINISH, /* 2nd part of a restart, i.e. the actual starting */
-        _JOB_TYPE_MAX
+
+        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
 };
 
-typedef enum JobState {
+enum JobState {
         JOB_WAITING,
         JOB_RUNNING,
-        JOB_DONE,
-        _JOB_STATE_MAX
-} JobState;
+        _JOB_STATE_MAX,
+        _JOB_STATE_INVALID = -1
+};
 
 enum JobMode {
         JOB_FAIL,
@@ -39,19 +49,69 @@ enum JobMode {
         _JOB_MODE_MAX
 };
 
+struct JobDependency {
+        /* Encodes that the 'subject' job needs the 'object' job in
+         * some way. This structure is used only while building a transaction. */
+        Job *subject;
+        Job *object;
+
+        bool matters;
+
+        LIST_FIELDS(JobDependency, subject);
+        LIST_FIELDS(JobDependency, object);
+};
+
 struct Job {
         Manager *manager;
         uint32_t id;
 
+        Unit *unit;
+
         JobType type;
         JobState state;
-        Name *name;
 
-        bool linked:1;
+        bool installed:1;
+        bool in_run_queue:1;
+        bool matters_to_anchor:1;
+        bool forced:1;
+
+        LIST_FIELDS(Job, transaction);
+        LIST_FIELDS(Job, run_queue);
+
+        LIST_HEAD(JobDependency, subject_list);
+        LIST_HEAD(JobDependency, object_list);
+
+        /* Used for graph algs as a "I have been here" marker */
+        Job* marker;
+        unsigned generation;
+
 };
 
-Job* job_new(Manager *m, JobType type, Name *name);
+Job* job_new(Manager *m, JobType type, Unit *unit);
 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);
+void job_dependency_delete(Job *subject, Job *object, bool *matters);
+
+bool job_is_anchor(Job *j);
+
+int job_merge(Job *j, Job *other);
+
+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);
+
+const char* job_type_to_string(JobType t);
+JobType job_type_from_string(const char *s);
+
+const char* job_state_to_string(JobState t);
+JobState job_state_from_string(const char *s);
 
 #endif