X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=job.c;h=d02551aff443e5aa2135cd4cdbc1145f2b035b66;hp=0ae1a765fb06a3f387296d0eda76e377da4a3c6f;hb=ea4309869e75497ba6a97c540646cb66a157a4d9;hpb=5cb5a6ffc33667c93e9bc3572534dcaa684046e3 diff --git a/job.c b/job.c index 0ae1a765f..d02551aff 100644 --- a/job.c +++ b/job.c @@ -3,15 +3,20 @@ #include #include +#include "set.h" +#include "unit.h" #include "macro.h" -#include "job.h" +#include "strv.h" +#include "load-fragment.h" +#include "load-dropin.h" +#include "log.h" -Job* job_new(Manager *m, JobType type, Name *name) { +Job* job_new(Manager *m, JobType type, Unit *unit) { Job *j; assert(m); assert(type < _JOB_TYPE_MAX); - assert(name); + assert(unit); if (!(j = new0(Job, 1))) return NULL; @@ -19,7 +24,7 @@ Job* job_new(Manager *m, JobType type, Name *name) { j->manager = m; j->id = m->current_job_id++; j->type = type; - j->name = name; + j->unit = unit; /* We don't link it here, that's what job_dependency() is for */ @@ -30,12 +35,12 @@ void job_free(Job *j) { assert(j); /* Detach from next 'bigger' objects */ - if (j->linked) { - if (j->name->meta.job == j) - j->name->meta.job = NULL; + if (j->installed) { + if (j->unit->meta.job == j) + j->unit->meta.job = NULL; hashmap_remove(j->manager->jobs, UINT32_TO_PTR(j->id)); - j->linked = false; + j->installed = false; } /* Detach from next 'smaller' objects */ @@ -61,22 +66,12 @@ JobDependency* job_dependency_new(Job *subject, Job *object, bool matters) { l->object = object; l->matters = matters; - if (subject) { - l->subject_next = subject->subject_list; - subject->subject_list = l; - } else { - l->subject_next = object->manager->transaction_anchor; - object->manager->transaction_anchor = l; - } - - if (l->subject_next) - l->subject_next->subject_prev = l; - l->subject_prev = NULL; + if (subject) + LIST_PREPEND(JobDependency, subject, subject->subject_list, l); + else + LIST_PREPEND(JobDependency, subject, object->manager->transaction_anchor, l); - if ((l->object_next = object->object_list)) - l->object_next->object_prev = l; - l->object_prev = NULL; - object->object_list = l; + LIST_PREPEND(JobDependency, object, object->object_list, l); return l; } @@ -84,23 +79,12 @@ JobDependency* job_dependency_new(Job *subject, Job *object, bool matters) { void job_dependency_free(JobDependency *l) { assert(l); - if (l->subject_prev) - l->subject_prev->subject_next = l->subject_next; - else if (l->subject) - l->subject->subject_list = l->subject_next; - else - l->object->manager->transaction_anchor = l->subject_next; - - if (l->subject_next) - l->subject_next->subject_prev = l->subject_prev; - - if (l->object_prev) - l->object_prev->object_next = l->object_next; + if (l->subject) + LIST_REMOVE(JobDependency, subject, l->subject->subject_list, l); else - l->object->object_list = l->object_next; + LIST_REMOVE(JobDependency, subject, l->object->manager->transaction_anchor, l); - if (l->object_next) - l->object_next->object_prev = l->object_prev; + LIST_REMOVE(JobDependency, object, l->object->object_list, l); free(l); } @@ -110,7 +94,7 @@ void job_dependency_delete(Job *subject, Job *object, bool *matters) { assert(object); - for (l = object->object_list; l; l = l->object_next) { + LIST_FOREACH(object, l, object->object_list) { assert(l->object == object); if (l->subject == subject) @@ -129,42 +113,20 @@ void job_dependency_delete(Job *subject, Job *object, bool *matters) { job_dependency_free(l); } -const char* job_type_to_string(JobType t) { - - static const char* const job_type_table[_JOB_TYPE_MAX] = { - [JOB_START] = "start", - [JOB_VERIFY_ACTIVE] = "verify-active", - [JOB_STOP] = "stop", - [JOB_RELOAD] = "reload", - [JOB_RELOAD_OR_START] = "reload-or-start", - [JOB_RESTART] = "restart", - [JOB_TRY_RESTART] = "try-restart", - }; - - if (t < 0 || t >= _JOB_TYPE_MAX) - return "n/a"; - - return job_type_table[t]; -} - void job_dump(Job *j, FILE*f, const char *prefix) { - static const char* const job_state_table[_JOB_STATE_MAX] = { - [JOB_WAITING] = "waiting", - [JOB_RUNNING] = "running" - }; assert(j); assert(f); fprintf(f, - "%sJob %u:\n" + "%s→ Job %u:\n" "%s\tAction: %s → %s\n" "%s\tState: %s\n" "%s\tForced: %s\n", prefix, j->id, - prefix, name_id(j->name), job_type_to_string(j->type), - prefix, job_state_table[j->state], + prefix, unit_id(j->unit), job_type_to_string(j->type), + prefix, job_state_to_string(j->state), prefix, yes_no(j->forced)); } @@ -173,7 +135,7 @@ bool job_is_anchor(Job *j) { assert(j); - for (l = j->object_list; l; l = l->object_next) + LIST_FOREACH(object, l, j->object_list) if (!l->subject) return true; @@ -276,39 +238,14 @@ bool job_type_is_conflicting(JobType a, JobType b) { return (a == JOB_STOP) != (b == JOB_STOP); } -bool job_type_is_applicable(JobType j, NameType n) { - assert(j >= 0 && j < _JOB_TYPE_MAX); - assert(n >= 0 && n < _NAME_TYPE_MAX); - - switch (j) { - case JOB_VERIFY_ACTIVE: - case JOB_START: - return true; - - case JOB_STOP: - case JOB_RESTART: - case JOB_TRY_RESTART: - return name_type_can_start(n); - - case JOB_RELOAD: - return name_type_can_reload(n); - - case JOB_RELOAD_OR_START: - return name_type_can_reload(n) && name_type_can_start(n); - - default: - assert_not_reached("Invalid job type"); - } -} - bool job_is_runnable(Job *j) { - void *state; - Name *other; + Iterator i; + Unit *other; assert(j); - assert(j->linked); + assert(j->installed); - /* Checks whether there is any job running for the names this + /* Checks whether there is any job running for the units this * job needs to be running after (in the case of a 'positive' * job type) or before (in the case of a 'negative' job type * . */ @@ -323,7 +260,7 @@ bool job_is_runnable(Job *j) { * dependencies, regardless whether they are * starting or stopping something. */ - SET_FOREACH(other, j->name->meta.dependencies[NAME_AFTER], state) + SET_FOREACH(other, j->unit->meta.dependencies[UNIT_AFTER], i) if (other->meta.job) return false; } @@ -331,7 +268,7 @@ bool job_is_runnable(Job *j) { /* Also, if something else is being stopped and we should * change state after it, then lets wait. */ - SET_FOREACH(other, j->name->meta.dependencies[NAME_BEFORE], state) + SET_FOREACH(other, j->unit->meta.dependencies[UNIT_BEFORE], i) if (other->meta.job && (other->meta.job->type == JOB_STOP || other->meta.job->type == JOB_RESTART || @@ -354,27 +291,36 @@ bool job_is_runnable(Job *j) { int job_run_and_invalidate(Job *j) { int r; + assert(j); + assert(j->installed); - if (!job_is_runnable(j)) - return -EAGAIN; + if (j->in_run_queue) { + LIST_REMOVE(Job, run_queue, j->manager->run_queue, j); + j->in_run_queue = false; + } if (j->state != JOB_WAITING) return 0; + if (!job_is_runnable(j)) + return -EAGAIN; + + j->state = JOB_RUNNING; + switch (j->type) { case JOB_START: - r = name_start(j->name); + r = unit_start(j->unit); if (r == -EBADR) r = 0; break; case JOB_VERIFY_ACTIVE: { - NameActiveState t = name_active_state(j->name); - if (NAME_IS_ACTIVE_OR_RELOADING(t)) + UnitActiveState t = unit_active_state(j->unit); + if (UNIT_IS_ACTIVE_OR_RELOADING(t)) r = -EALREADY; - else if (t == NAME_ACTIVATING) + else if (t == UNIT_ACTIVATING) r = -EAGAIN; else r = -ENOEXEC; @@ -382,71 +328,83 @@ int job_run_and_invalidate(Job *j) { } case JOB_STOP: - r = name_stop(j->name); + r = unit_stop(j->unit); break; case JOB_RELOAD: - r = name_reload(j->name); + r = unit_reload(j->unit); break; case JOB_RELOAD_OR_START: - if (name_active_state(j->name) == NAME_ACTIVE) - r = name_reload(j->name); + if (unit_active_state(j->unit) == UNIT_ACTIVE) + r = unit_reload(j->unit); else - r = name_start(j->name); + r = unit_start(j->unit); break; case JOB_RESTART: { - NameActiveState t = name_active_state(j->name); - if (t == NAME_INACTIVE || t == NAME_ACTIVATING) { + UnitActiveState t = unit_active_state(j->unit); + if (t == UNIT_INACTIVE || t == UNIT_ACTIVATING) { j->type = JOB_START; - r = name_start(j->name); + r = unit_start(j->unit); } else - r = name_stop(j->name); + r = unit_stop(j->unit); break; } case JOB_TRY_RESTART: { - NameActiveState t = name_active_state(j->name); - if (t == NAME_INACTIVE || t == NAME_DEACTIVATING) + UnitActiveState t = unit_active_state(j->unit); + if (t == UNIT_INACTIVE || t == UNIT_DEACTIVATING) r = -ENOEXEC; - else if (t == NAME_ACTIVATING) { + else if (t == UNIT_ACTIVATING) { j->type = JOB_START; - r = name_start(j->name); + r = unit_start(j->unit); } else - r = name_stop(j->name); + r = unit_stop(j->unit); break; } default: - ; + assert_not_reached("Unknown job type"); } - if (r >= 0) - j->state = JOB_RUNNING; - else if (r == -EALREADY) + if (r == -EALREADY) r = job_finish_and_invalidate(j, true); - else if (r != -EAGAIN) + else if (r == -EAGAIN) { + j->state = JOB_WAITING; + return -EAGAIN; + } else if (r < 0) r = job_finish_and_invalidate(j, false); return r; } int job_finish_and_invalidate(Job *j, bool success) { - Name *n; - void *state; - Name *other; - NameType t; + Unit *u; + Unit *other; + UnitType t; + Iterator i; assert(j); + assert(j->installed); + + log_debug("Job %s/%s finished, success=%s", unit_id(j->unit), job_type_to_string(j->type), yes_no(success)); + /* Patch restart jobs so that they become normal start jobs */ if (success && (j->type == JOB_RESTART || j->type == JOB_TRY_RESTART)) { + + log_debug("Converting job %s/%s → %s/%s", + unit_id(j->unit), job_type_to_string(j->type), + unit_id(j->unit), job_type_to_string(JOB_START)); + j->state = JOB_RUNNING; j->type = JOB_START; - return job_run_and_invalidate(j); + + job_schedule_run(j); + return 0; } - n = j->name; + u = j->unit; t = j->type; job_free(j); @@ -457,14 +415,14 @@ int job_finish_and_invalidate(Job *j, bool success) { t == JOB_VERIFY_ACTIVE || t == JOB_RELOAD_OR_START) { - SET_FOREACH(other, n->meta.dependencies[NAME_REQUIRED_BY], state) + SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i) if (other->meta.job && (other->meta.type == JOB_START || other->meta.type == JOB_VERIFY_ACTIVE || other->meta.type == JOB_RELOAD_OR_START)) job_finish_and_invalidate(other->meta.job, false); - SET_FOREACH(other, n->meta.dependencies[NAME_SOFT_REQUIRED_BY], state) + SET_FOREACH(other, u->meta.dependencies[UNIT_SOFT_REQUIRED_BY], i) if (other->meta.job && !other->meta.job->forced && (other->meta.type == JOB_START || @@ -474,7 +432,7 @@ int job_finish_and_invalidate(Job *j, bool success) { } else if (t == JOB_STOP) { - SET_FOREACH(other, n->meta.dependencies[NAME_CONFLICTS], state) + SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTS], i) if (other->meta.job && (t == JOB_START || t == JOB_VERIFY_ACTIVE || @@ -484,12 +442,53 @@ int job_finish_and_invalidate(Job *j, bool success) { } /* Try to start the next jobs that can be started */ - SET_FOREACH(other, n->meta.dependencies[NAME_AFTER], state) + SET_FOREACH(other, u->meta.dependencies[UNIT_AFTER], i) if (other->meta.job) - job_run_and_invalidate(other->meta.job); - SET_FOREACH(other, n->meta.dependencies[NAME_BEFORE], state) + job_schedule_run(other->meta.job); + SET_FOREACH(other, u->meta.dependencies[UNIT_BEFORE], i) if (other->meta.job) - job_run_and_invalidate(other->meta.job); + job_schedule_run(other->meta.job); return 0; } + +void job_schedule_run(Job *j) { + assert(j); + assert(j->installed); + + if (j->in_run_queue) + return; + + LIST_PREPEND(Job, run_queue, j->manager->run_queue, j); + j->in_run_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" +}; + +DEFINE_STRING_TABLE_LOOKUP(job_state, JobState); + +static const char* const job_type_table[_JOB_TYPE_MAX] = { + [JOB_START] = "start", + [JOB_VERIFY_ACTIVE] = "verify-active", + [JOB_STOP] = "stop", + [JOB_RELOAD] = "reload", + [JOB_RELOAD_OR_START] = "reload-or-start", + [JOB_RESTART] = "restart", + [JOB_TRY_RESTART] = "try-restart", +}; + +DEFINE_STRING_TABLE_LOOKUP(job_type, JobType);