X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=job.h;h=1ae97b75d02a0d7087e33bc32dd369e21252d6e4;hb=93ef5e80ae6b1ee897e032a24e323fe237f28f91;hp=bfe20339ece02aa5277159aa9ea12c90e46e5ac3;hpb=c1e1601e8c6cace85b19a0eebe50076e5d119688;p=elogind.git

diff --git a/job.h b/job.h
index bfe20339e..1ae97b75d 100644
--- a/job.h
+++ b/job.h
@@ -65,6 +65,7 @@ enum JobState {
 enum JobMode {
         JOB_FAIL,
         JOB_REPLACE,
+        JOB_ISOLATE,
         _JOB_MODE_MAX,
         _JOB_MODE_INVALID = -1
 };
@@ -75,28 +76,16 @@ struct JobDependency {
         Job *subject;
         Job *object;
 
-        bool matters;
-
         LIST_FIELDS(JobDependency, subject);
         LIST_FIELDS(JobDependency, object);
+
+        bool matters;
 };
 
 struct Job {
         Manager *manager;
-        uint32_t id;
-
         Unit *unit;
 
-        JobType type;
-        JobState state;
-
-        bool installed:1;
-        bool in_run_queue:1;
-        bool matters_to_anchor:1;
-        bool forced:1;
-        bool in_dbus_queue:1;
-        bool sent_dbus_new_signal:1;
-
         LIST_FIELDS(Job, transaction);
         LIST_FIELDS(Job, run_queue);
         LIST_FIELDS(Job, dbus_queue);
@@ -108,6 +97,17 @@ struct Job {
         Job* marker;
         unsigned generation;
 
+        uint32_t id;
+
+        JobType type;
+        JobState state;
+
+        bool installed:1;
+        bool in_run_queue:1;
+        bool matters_to_anchor:1;
+        bool override:1;
+        bool in_dbus_queue:1;
+        bool sent_dbus_new_signal:1;
 };
 
 Job* job_new(Manager *m, JobType type, Unit *unit);
@@ -126,6 +126,7 @@ 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_redundant(JobType a, UnitActiveState b);
 
 bool job_is_runnable(Job *j);