log: rework logging subsystem to support syslog and kmsg output

[elogind.git] / job.c

diff --git a/job.c b/job.c
index e2354af3fc1a2305c5ebcdeb41ab56c0c1682675..6e04683fdd8bb7f1f501aee4de0261fda572686c 100644 (file)
--- a/job.c
+++ b/job.c
@@ -65,7 +65,7 @@ void job_free(Job *j) {
         }
 
         /* Detach from next 'smaller' objects */
-        manager_transaction_unlink_job(j->manager, j);
+        manager_transaction_unlink_job(j->manager, j, true);
 
         if (j->in_run_queue)
                 LIST_REMOVE(Job, run_queue, j->manager->run_queue, j);
@@ -265,6 +265,45 @@ bool job_type_is_conflicting(JobType a, JobType b) {
         return (a == JOB_STOP) != (b == JOB_STOP);
 }
 
+bool job_type_is_redundant(JobType a, UnitActiveState b) {
+        switch (a) {
+
+        case JOB_START:
+                return
+                        b == UNIT_ACTIVE ||
+                        b == UNIT_ACTIVE_RELOADING;
+
+        case JOB_STOP:
+                return
+                        b == UNIT_INACTIVE;
+
+        case JOB_VERIFY_ACTIVE:
+                return
+                        b == UNIT_ACTIVE ||
+                        b == UNIT_ACTIVE_RELOADING;
+
+        case JOB_RELOAD:
+                return
+                        b == UNIT_ACTIVE_RELOADING;
+
+        case JOB_RELOAD_OR_START:
+                return
+                        b == UNIT_ACTIVATING ||
+                        b == UNIT_ACTIVE_RELOADING;
+
+        case JOB_RESTART:
+                return
+                        b == UNIT_ACTIVATING;
+
+        case JOB_TRY_RESTART:
+                return
+                        b == UNIT_ACTIVATING;
+
+        default:
+                assert_not_reached("Invalid job type");
+        }
+}
+
 bool job_is_runnable(Job *j) {
         Iterator i;
         Unit *other;