X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.c;h=be42eaff62f5ed9fcbad31131833bf1aa0b3cc04;hp=378a85df6708652bc6fc4e6dea9edc0ba7957aad;hb=84e9af1e01bfcc3ce9897c62aa76d356e97aa092;hpb=94f043472a5af62dc9cd5767e89ba33872212d5e
diff --git a/job.c b/job.c
index 378a85df6..be42eaff6 100644
--- a/job.c
+++ b/job.c
@@ -1,5 +1,24 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
#include
#include
@@ -36,6 +55,8 @@ void job_free(Job *j) {
/* Detach from next 'bigger' objects */
if (j->installed) {
+ bus_job_send_removed_signal(j);
+
if (j->unit->meta.job == j)
j->unit->meta.job = NULL;
@@ -46,6 +67,12 @@ void job_free(Job *j) {
/* Detach from next 'smaller' objects */
manager_transaction_unlink_job(j->manager, j);
+ if (j->in_run_queue)
+ LIST_REMOVE(Job, run_queue, j->manager->run_queue, j);
+
+ if (j->in_dbus_queue)
+ LIST_REMOVE(Job, dbus_queue, j->manager->dbus_job_queue, j);
+
free(j);
}
@@ -307,6 +334,7 @@ int job_run_and_invalidate(Job *j) {
return -EAGAIN;
j->state = JOB_RUNNING;
+ job_add_to_dbus_queue(j);
switch (j->type) {
@@ -389,6 +417,7 @@ int job_finish_and_invalidate(Job *j, bool success) {
assert(j->installed);
log_debug("Job %s/%s finished, success=%s", unit_id(j->unit), job_type_to_string(j->type), yes_no(success));
+ job_add_to_dbus_queue(j);
/* Patch restart jobs so that they become normal start jobs */
if (success && (j->type == JOB_RESTART || j->type == JOB_TRY_RESTART)) {
@@ -400,7 +429,7 @@ int job_finish_and_invalidate(Job *j, bool success) {
j->state = JOB_RUNNING;
j->type = JOB_START;
- job_schedule_run(j);
+ job_add_to_run_queue(j);
return 0;
}
@@ -444,15 +473,15 @@ int job_finish_and_invalidate(Job *j, bool success) {
/* Try to start the next jobs that can be started */
SET_FOREACH(other, u->meta.dependencies[UNIT_AFTER], i)
if (other->meta.job)
- job_schedule_run(other->meta.job);
+ job_add_to_run_queue(other->meta.job);
SET_FOREACH(other, u->meta.dependencies[UNIT_BEFORE], i)
if (other->meta.job)
- job_schedule_run(other->meta.job);
+ job_add_to_run_queue(other->meta.job);
return 0;
}
-void job_schedule_run(Job *j) {
+void job_add_to_run_queue(Job *j) {
assert(j);
assert(j->installed);
@@ -463,6 +492,28 @@ void job_schedule_run(Job *j) {
j->in_run_queue = true;
}
+void job_add_to_dbus_queue(Job *j) {
+ assert(j);
+ assert(j->installed);
+
+ if (j->in_dbus_queue)
+ return;
+
+ LIST_PREPEND(Job, dbus_queue, j->manager->dbus_job_queue, j);
+ j->in_dbus_queue = true;
+}
+
+char *job_dbus_path(Job *j) {
+ char *p;
+
+ assert(j);
+
+ if (asprintf(&p, "/org/freedesktop/systemd1/job/%lu", (unsigned long) j->id) < 0)
+ return NULL;
+
+ return p;
+}
+
static const char* const job_state_table[_JOB_STATE_MAX] = {
[JOB_WAITING] = "waiting",
[JOB_RUNNING] = "running"
@@ -481,3 +532,10 @@ static const char* const job_type_table[_JOB_TYPE_MAX] = {
};
DEFINE_STRING_TABLE_LOOKUP(job_type, JobType);
+
+static const char* const job_mode_table[_JOB_MODE_MAX] = {
+ [JOB_FAIL] = "fail",
+ [JOB_REPLACE] = "replace"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(job_mode, JobMode);