chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git: ignore Makefile
[elogind.git]
/
job.c
diff --git
a/job.c
b/job.c
index 4784d9c05dbc200ae81853b9b026129690b0af8b..be42eaff62f5ed9fcbad31131833bf1aa0b3cc04 100644
(file)
--- a/
job.c
+++ b/
job.c
@@
-55,6
+55,8
@@
void job_free(Job *j) {
/* Detach from next 'bigger' objects */
if (j->installed) {
/* 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;
if (j->unit->meta.job == j)
j->unit->meta.job = NULL;
@@
-65,6
+67,12
@@
void job_free(Job *j) {
/* Detach from next 'smaller' objects */
manager_transaction_unlink_job(j->manager, 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);
}
free(j);
}
@@
-326,6
+334,7
@@
int job_run_and_invalidate(Job *j) {
return -EAGAIN;
j->state = JOB_RUNNING;
return -EAGAIN;
j->state = JOB_RUNNING;
+ job_add_to_dbus_queue(j);
switch (j->type) {
switch (j->type) {
@@
-408,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));
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)) {
/* Patch restart jobs so that they become normal start jobs */
if (success && (j->type == JOB_RESTART || j->type == JOB_TRY_RESTART)) {
@@
-419,7
+429,7
@@
int job_finish_and_invalidate(Job *j, bool success) {
j->state = JOB_RUNNING;
j->type = JOB_START;
j->state = JOB_RUNNING;
j->type = JOB_START;
- job_
schedule_run
(j);
+ job_
add_to_run_queue
(j);
return 0;
}
return 0;
}
@@
-463,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)
/* 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)
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;
}
return 0;
}
-void job_
schedule_run
(Job *j) {
+void job_
add_to_run_queue
(Job *j) {
assert(j);
assert(j->installed);
assert(j);
assert(j->installed);
@@
-482,6
+492,17
@@
void job_schedule_run(Job *j) {
j->in_run_queue = true;
}
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;
char *job_dbus_path(Job *j) {
char *p;