X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.h;h=dd5e31aa1400d7c0ceb6981cdbecb261c3d93b26;hp=d19f747dbdfc3c3c0313553b27b64007b515820b;hb=d6ea93e31d96c67366feee0413a3c307fcffea2b;hpb=6091827530d6dd43479d6709fb6e9f745c11e900

diff --git a/job.h b/job.h
index d19f747db..dd5e31aa1 100644
--- a/job.h
+++ b/job.h
@@ -7,31 +7,40 @@
 #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;
+};
 
 enum JobMode {
         JOB_FAIL,
@@ -39,19 +48,64 @@ 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);
-int job_link(Job *job);
+Job* job_new(Manager *m, JobType type, Unit *unit);
 void job_free(Job *job);
+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);
+
+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