when shortcutting states do not skip state transitions

[elogind.git] / job.h

diff --git a/job.h b/job.h
index fbfaa16b2ff7a1bb6c1a7b4919abf85f4dac135e..dd5e31aa1400d7c0ceb6981cdbecb261c3d93b26 100644 (file)
--- a/job.h
+++ b/job.h
@@ -13,12 +13,12 @@ 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,                  /* if a name does not support being started, we'll just wait until it becomes active */
+        JOB_START,                  /* if a unit does not support being started, we'll just wait until it becomes active */
         JOB_VERIFY_ACTIVE,
 
         JOB_STOP,
@@ -56,36 +56,37 @@ 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 {
         Manager *manager;
         uint32_t id;
 
-        Name *name;
+        Unit *unit;
 
         JobType type;
         JobState state;
 
-        bool linked:1;
+        bool installed: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 */
         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, const char *prefix);
 
@@ -102,8 +103,8 @@ 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);
-bool job_type_is_applicable(JobType j, NameType n);
 
+void job_schedule_run(Job *j);
 int job_run_and_invalidate(Job *j);
 int job_finish_and_invalidate(Job *j, bool success);