chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd17d38
)
job: add debug prints where job type gets changed
author
Michal Schmidt
<mschmidt@redhat.com>
Tue, 27 Mar 2012 23:26:04 +0000
(
01:26
+0200)
committer
Michal Schmidt
<mschmidt@redhat.com>
Wed, 28 Mar 2012 09:13:13 +0000
(11:13 +0200)
src/job.c
patch
|
blob
|
history
diff --git
a/src/job.c
b/src/job.c
index d43ce8e88d914f3f4bbbfbd181cf34a1a5fb69d3..8e944b35dbf983f982e4e658bd7d84cd7b65a5c5 100644
(file)
--- a/
src/job.c
+++ b/
src/job.c
@@
-355,6
+355,14
@@
bool job_is_runnable(Job *j) {
return true;
}
return true;
}
+static void job_change_type(Job *j, JobType newtype) {
+ log_debug("Converting job %s/%s -> %s/%s",
+ j->unit->id, job_type_to_string(j->type),
+ j->unit->id, job_type_to_string(newtype));
+
+ j->type = newtype;
+}
+
int job_run_and_invalidate(Job *j) {
int r;
uint32_t id;
int job_run_and_invalidate(Job *j) {
int r;
uint32_t id;
@@
-389,11
+397,11
@@
int job_run_and_invalidate(Job *j) {
case JOB_RELOAD_OR_START:
if (unit_active_state(j->unit) == UNIT_ACTIVE) {
case JOB_RELOAD_OR_START:
if (unit_active_state(j->unit) == UNIT_ACTIVE) {
- j
->type = JOB_RELOAD
;
+ j
ob_change_type(j, JOB_RELOAD)
;
r = unit_reload(j->unit);
break;
}
r = unit_reload(j->unit);
break;
}
- j
->type = JOB_START
;
+ j
ob_change_type(j, JOB_START)
;
/* fall through */
case JOB_START:
/* fall through */
case JOB_START:
@@
-420,7
+428,7
@@
int job_run_and_invalidate(Job *j) {
r = -ENOEXEC;
break;
}
r = -ENOEXEC;
break;
}
- j
->type = JOB_RESTART
;
+ j
ob_change_type(j, JOB_RESTART)
;
/* fall through */
case JOB_STOP:
/* fall through */
case JOB_STOP:
@@
-516,12
+524,8
@@
int job_finish_and_invalidate(Job *j, JobResult result) {
/* Patch restart jobs so that they become normal start jobs */
if (result == JOB_DONE && j->type == JOB_RESTART) {
/* Patch restart jobs so that they become normal start jobs */
if (result == JOB_DONE && j->type == JOB_RESTART) {
- log_debug("Converting job %s/%s -> %s/%s",
- j->unit->id, job_type_to_string(j->type),
- j->unit->id, job_type_to_string(JOB_START));
-
+ job_change_type(j, JOB_START);
j->state = JOB_WAITING;
j->state = JOB_WAITING;
- j->type = JOB_START;
job_add_to_run_queue(j);
job_add_to_run_queue(j);