X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.c;h=600b89ccf5af9510b339e7e3d57c883cdc1e3e4f;hp=456eb8db1cc5ce703b8d975c143d2b3c90cc9acb;hb=01184e042b1798e9b2f688463637aaf3b0ef576f;hpb=16354eff99fe673f912862138c4dce30bbd0afb5 diff --git a/manager.c b/manager.c index 456eb8db1..600b89ccf 100644 --- a/manager.c +++ b/manager.c @@ -3,6 +3,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include "manager.h" #include "hashmap.h" @@ -12,11 +18,15 @@ Manager* manager_new(void) { Manager *m; + sigset_t mask; + struct epoll_event ev; if (!(m = new0(Manager, 1))) return NULL; - if (!(m->names = hashmap_new(string_hash_func, string_compare_func))) + m->signal_fd = m->epoll_fd = -1; + + if (!(m->units = hashmap_new(string_hash_func, string_compare_func))) goto fail; if (!(m->jobs = hashmap_new(trivial_hash_func, trivial_compare_func))) @@ -25,6 +35,26 @@ Manager* manager_new(void) { if (!(m->transaction_jobs = hashmap_new(trivial_hash_func, trivial_compare_func))) goto fail; + if (!(m->watch_pids = hashmap_new(trivial_hash_func, trivial_compare_func))) + goto fail; + + if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) + goto fail; + + assert_se(sigemptyset(&mask) == 0); + assert_se(sigaddset(&mask, SIGCHLD) == 0); + assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); + + if ((m->signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0) + goto fail; + + zero(ev); + ev.events = EPOLLIN; + ev.data.fd = m->signal_fd; + + if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->signal_fd, &ev) < 0) + goto fail; + return m; fail: @@ -33,32 +63,60 @@ fail: } void manager_free(Manager *m) { - Name *n; + Unit *u; Job *j; assert(m); - while ((n = hashmap_first(m->names))) - name_free(n); - - while ((j = hashmap_steal_first(m->transaction_jobs))) + while ((j = hashmap_first(m->transaction_jobs))) job_free(j); - hashmap_free(m->names); + while ((u = hashmap_first(m->units))) + unit_free(u); + + hashmap_free(m->units); hashmap_free(m->jobs); hashmap_free(m->transaction_jobs); + hashmap_free(m->watch_pids); + + if (m->epoll_fd >= 0) + close_nointr(m->epoll_fd); + if (m->signal_fd >= 0) + close_nointr(m->signal_fd); free(m); } +static void transaction_delete_job(Manager *m, Job *j) { + assert(m); + assert(j); + + /* Deletes one job from the transaction */ + + manager_transaction_unlink_job(m, j); + + if (!j->installed) + job_free(j); +} + +static void transaction_delete_unit(Manager *m, Unit *u) { + Job *j; + + /* Deletes all jobs associated with a certain unit from the + * transaction */ + + while ((j = hashmap_get(m->transaction_jobs, u))) + transaction_delete_job(m, j); +} + static void transaction_abort(Manager *m) { Job *j; assert(m); while ((j = hashmap_first(m->transaction_jobs))) - if (j->linked) - manager_transaction_delete_job(m, j); + if (j->installed) + transaction_delete_job(m, j); else job_free(j); @@ -71,13 +129,23 @@ static void transaction_find_jobs_that_matter_to_anchor(Manager *m, Job *j, unsi assert(m); - for (l = j ? j->subject_list : m->transaction_anchor; l; l = l->subject_next) { + /* A recursive sweep through the graph that marks all units + * that matter to the anchor job, i.e. are directly or + * indirectly a dependency of the anchor job via paths that + * are fully marked as mattering. */ + + if (j) + l = j->subject_list; + else + l = m->transaction_anchor; + + LIST_FOREACH(subject, l, l) { /* This link does not matter */ if (!l->matters) continue; - /* This name has already been marked */ + /* This unit has already been marked */ if (l->object->generation == generation) continue; @@ -88,56 +156,25 @@ static void transaction_find_jobs_that_matter_to_anchor(Manager *m, Job *j, unsi } } -static bool types_match(JobType a, JobType b, JobType c, JobType d) { - return - (a == c && b == d) || - (a == d && b == c); -} - -static int types_merge(JobType *a, JobType b) { - if (*a == b) - return 0; - - if (types_match(*a, b, JOB_START, JOB_VERIFY_STARTED)) - *a = JOB_START; - else if (types_match(*a, b, JOB_START, JOB_RELOAD) || - types_match(*a, b, JOB_START, JOB_RELOAD_OR_START) || - types_match(*a, b, JOB_VERIFY_STARTED, JOB_RELOAD_OR_START) || - types_match(*a, b, JOB_RELOAD, JOB_RELOAD_OR_START)) - *a = JOB_RELOAD_OR_START; - else if (types_match(*a, b, JOB_START, JOB_RESTART) || - types_match(*a, b, JOB_START, JOB_TRY_RESTART) || - types_match(*a, b, JOB_VERIFY_STARTED, JOB_RESTART) || - types_match(*a, b, JOB_RELOAD, JOB_RESTART) || - types_match(*a, b, JOB_RELOAD_OR_START, JOB_RESTART) || - types_match(*a, b, JOB_RELOAD_OR_START, JOB_TRY_RESTART) || - types_match(*a, b, JOB_RESTART, JOB_TRY_RESTART)) - *a = JOB_RESTART; - else if (types_match(*a, b, JOB_VERIFY_STARTED, JOB_RELOAD)) - *a = JOB_RELOAD; - else if (types_match(*a, b, JOB_VERIFY_STARTED, JOB_TRY_RESTART) || - types_match(*a, b, JOB_RELOAD, JOB_TRY_RESTART)) - *a = JOB_TRY_RESTART; - - return -EEXIST; -} - static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, JobType t) { JobDependency *l, *last; assert(j); assert(other); - assert(j->name == other->name); - assert(!j->linked); + assert(j->unit == other->unit); + assert(!j->installed); + + /* Merges 'other' into 'j' and then deletes j. */ j->type = t; j->state = JOB_WAITING; + j->forced = j->forced || other->forced; j->matters_to_anchor = j->matters_to_anchor || other->matters_to_anchor; /* Patch us in as new owner of the JobDependency objects */ last = NULL; - for (l = other->subject_list; l; l = l->subject_next) { + LIST_FOREACH(subject, l, other->subject_list) { assert(l->subject == other); l->subject = j; last = l; @@ -153,7 +190,7 @@ static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, Job /* Patch us in as new owner of the JobDependency objects */ last = NULL; - for (l = other->object_list; l; l = l->object_next) { + LIST_FOREACH(object, l, other->object_list) { assert(l->object == other); l->object = j; last = l; @@ -170,26 +207,95 @@ static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, Job /* Kill the other job */ other->subject_list = NULL; other->object_list = NULL; - manager_transaction_delete_job(m, other); + transaction_delete_job(m, other); +} + +static int delete_one_unmergeable_job(Manager *m, Job *j) { + Job *k; + + assert(j); + + /* Tries to delete one item in the linked list + * j->transaction_next->transaction_next->... that conflicts + * whith another one, in an attempt to make an inconsistent + * transaction work. */ + + /* We rely here on the fact that if a merged with b does not + * merge with c, either a or b merge with c neither */ + LIST_FOREACH(transaction, j, j) + LIST_FOREACH(transaction, k, j->transaction_next) { + Job *d; + + /* Is this one mergeable? Then skip it */ + if (job_type_is_mergeable(j->type, k->type)) + continue; + + /* Ok, we found two that conflict, let's see if we can + * drop one of them */ + if (!j->matters_to_anchor) + d = j; + else if (!k->matters_to_anchor) + d = k; + else + return -ENOEXEC; + + /* Ok, we can drop one, so let's do so. */ + log_debug("Try to fix job merging by deleting job %s/%s", unit_id(d->unit), job_type_to_string(d->type)); + transaction_delete_job(m, d); + return 0; + } + + return -EINVAL; } static int transaction_merge_jobs(Manager *m) { Job *j; - void *state; + Iterator i; int r; assert(m); - HASHMAP_FOREACH(j, m->transaction_jobs, state) { + /* First step, check whether any of the jobs for one specific + * task conflict. If so, try to drop one of them. */ + HASHMAP_FOREACH(j, m->transaction_jobs, i) { + JobType t; + Job *k; + + t = j->type; + LIST_FOREACH(transaction, k, j->transaction_next) { + if ((r = job_type_merge(&t, k->type)) >= 0) + continue; + + /* OK, we could not merge all jobs for this + * action. Let's see if we can get rid of one + * of them */ + + if ((r = delete_one_unmergeable_job(m, j)) >= 0) + /* Ok, we managed to drop one, now + * let's ask our callers to call us + * again after garbage collecting */ + return -EAGAIN; + + /* We couldn't merge anything. Failure */ + return r; + } + } + + /* Second step, merge the jobs. */ + HASHMAP_FOREACH(j, m->transaction_jobs, i) { JobType t = j->type; Job *k; - for (k = j->transaction_next; k; k = k->transaction_next) - if ((r = types_merge(&t, k->type)) < 0) - return r; + /* Merge all transactions */ + LIST_FOREACH(transaction, k, j->transaction_next) + assert_se(job_type_merge(&t, k->type) == 0); + + /* If an active job is mergeable, merge it too */ + if (j->unit->meta.job) + job_type_merge(&t, j->unit->meta.job->type); /* Might fail. Which is OK */ while ((k = j->transaction_next)) { - if (j->linked) { + if (j->installed) { transaction_merge_and_delete_job(m, k, j, t); j = k; } else @@ -203,26 +309,51 @@ static int transaction_merge_jobs(Manager *m) { return 0; } +static bool unit_matters_to_anchor(Unit *u, Job *j) { + assert(u); + assert(!j->transaction_prev); + + /* Checks whether at least one of the jobs for this unit + * matters to the anchor. */ + + LIST_FOREACH(transaction, j, j) + if (j->matters_to_anchor) + return true; + + return false; +} + static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned generation) { - void *state; - Name *n; + Iterator i; + Unit *u; int r; assert(m); assert(j); + assert(!j->transaction_prev); + + /* Does a recursive sweep through the ordering graph, looking + * for a cycle. If we find cycle we try to break it. */ /* Did we find a cycle? */ if (j->marker && j->generation == generation) { Job *k; /* So, we already have been here. We have a - * cycle. Let's try to break it. We go backwards in our - * path and try to find a suitable job to remove. */ + * cycle. Let's try to break it. We go backwards in + * our path and try to find a suitable job to + * remove. We use the marker to find our way back, + * since smart how we are we stored our way back in + * there. */ for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) { - if (!k->matters_to_anchor) { - log_debug("Breaking order cycle by deleting job %s", name_id(k->name)); - manager_transaction_delete_job(m, k); + + if (!k->installed && + !unit_matters_to_anchor(k->unit, k)) { + /* Ok, we can drop this one, so let's + * do so. */ + log_debug("Breaking order cycle by deleting job %s/%s", unit_id(k->unit), job_type_to_string(k->type)); + transaction_delete_unit(m, k->unit); return -EAGAIN; } @@ -232,20 +363,26 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned break; } - return -ELOOP; + return -ENOEXEC; } + /* Make the marker point to where we come from, so that we can + * find our way backwards if we want to break a cycle */ j->marker = from; j->generation = generation; - /* We assume that the the dependencies are both-ways, and - * hence can ignore NAME_AFTER */ - - SET_FOREACH(n, j->name->meta.dependencies[NAME_BEFORE], state) { + /* We assume that the the dependencies are bidirectional, and + * hence can ignore UNIT_AFTER */ + SET_FOREACH(u, j->unit->meta.dependencies[UNIT_BEFORE], i) { Job *o; - if (!(o = hashmap_get(m->transaction_jobs, n))) - if (!(o = n->meta.job)) + /* Is there a job for this unit? */ + if (!(o = hashmap_get(m->transaction_jobs, u))) + + /* Ok, there is no job for this in the + * transaction, but maybe there is already one + * running? */ + if (!(o = u->meta.job)) continue; if ((r = transaction_verify_order_one(m, o, j, generation)) < 0) @@ -256,36 +393,19 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned } static int transaction_verify_order(Manager *m, unsigned *generation) { - bool again; + Job *j; + int r; + Iterator i; + assert(m); assert(generation); - do { - Job *j; - int r; - void *state; - - again = false; + /* Check if the ordering graph is cyclic. If it is, try to fix + * that up by dropping one of the jobs. */ - HASHMAP_FOREACH(j, m->transaction_jobs, state) { - - /* Assume merged */ - assert(!j->transaction_next); - assert(!j->transaction_prev); - - if ((r = transaction_verify_order_one(m, j, NULL, (*generation)++)) < 0) { - - /* There was a cycleq, but it was fixed, - * we need to restart our algorithm */ - if (r == -EAGAIN) { - again = true; - break; - } - - return r; - } - } - } while (again); + HASHMAP_FOREACH(j, m->transaction_jobs, i) + if ((r = transaction_verify_order_one(m, j, NULL, (*generation)++)) < 0) + return r; return 0; } @@ -295,17 +415,20 @@ static void transaction_collect_garbage(Manager *m) { assert(m); + /* Drop jobs that are not required by any other job */ + do { - void *state; + Iterator i; Job *j; again = false; - HASHMAP_FOREACH(j, m->transaction_jobs, state) { + HASHMAP_FOREACH(j, m->transaction_jobs, i) { if (j->object_list) continue; - manager_transaction_delete_job(m, j); + log_debug("Garbage collecting job %s/%s", unit_id(j->unit), job_type_to_string(j->type)); + transaction_delete_job(m, j); again = true; break; } @@ -314,7 +437,7 @@ static void transaction_collect_garbage(Manager *m) { } static int transaction_is_destructive(Manager *m, JobMode mode) { - void *state; + Iterator i; Job *j; assert(m); @@ -322,20 +445,75 @@ static int transaction_is_destructive(Manager *m, JobMode mode) { /* Checks whether applying this transaction means that * existing jobs would be replaced */ - HASHMAP_FOREACH(j, m->transaction_jobs, state) - if (j->name->meta.job && j->name->meta.job != j) + HASHMAP_FOREACH(j, m->transaction_jobs, i) { + + /* Assume merged */ + assert(!j->transaction_prev); + assert(!j->transaction_next); + + if (j->unit->meta.job && + j->unit->meta.job != j && + !job_type_is_superset(j->type, j->unit->meta.job->type)) return -EEXIST; + } return 0; } +static void transaction_minimize_impact(Manager *m) { + bool again; + assert(m); + + /* Drops all unnecessary jobs that reverse already active jobs + * or that stop a running service. */ + + do { + Job *j; + Iterator i; + + again = false; + + HASHMAP_FOREACH(j, m->transaction_jobs, i) { + LIST_FOREACH(transaction, j, j) { + + /* If it matters, we shouldn't drop it */ + if (j->matters_to_anchor) + continue; + + /* Would this stop a running service? + * Would this change an existing job? + * If so, let's drop this entry */ + if ((j->type != JOB_STOP || UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(j->unit))) && + (!j->unit->meta.job || job_type_is_conflicting(j->type, j->unit->meta.job->state))) + continue; + + /* Ok, let's get rid of this */ + log_debug("Deleting %s/%s to minimize impact", unit_id(j->unit), job_type_to_string(j->type)); + transaction_delete_job(m, j); + again = true; + break; + } + + if (again) + break; + } + + } while (again); +} + static int transaction_apply(Manager *m, JobMode mode) { - void *state; + Iterator i; Job *j; int r; - HASHMAP_FOREACH(j, m->transaction_jobs, state) { - if (j->linked) + /* Moves the transaction jobs to the set of active jobs */ + + HASHMAP_FOREACH(j, m->transaction_jobs, i) { + /* Assume merged */ + assert(!j->transaction_prev); + assert(!j->transaction_next); + + if (j->installed) continue; if ((r = hashmap_put(m->jobs, UINT32_TO_PTR(j->id), j)) < 0) @@ -343,14 +521,14 @@ static int transaction_apply(Manager *m, JobMode mode) { } while ((j = hashmap_steal_first(m->transaction_jobs))) { - if (j->linked) + if (j->installed) continue; - if (j->name->meta.job) - job_free(j->name->meta.job); + if (j->unit->meta.job) + job_free(j->unit->meta.job); - j->name->meta.job = j; - j->linked = true; + j->unit->meta.job = j; + j->installed = true; /* We're fully installed. Now let's free data we don't * need anymore. */ @@ -358,18 +536,24 @@ static int transaction_apply(Manager *m, JobMode mode) { assert(!j->transaction_next); assert(!j->transaction_prev); + } + + /* As last step, kill all remaining job dependencies. */ + HASHMAP_FOREACH(j, m->jobs, i) { while (j->subject_list) job_dependency_free(j->subject_list); while (j->object_list) job_dependency_free(j->object_list); } + assert(!m->transaction_anchor); + return 0; rollback: - HASHMAP_FOREACH(j, m->transaction_jobs, state) { - if (j->linked) + HASHMAP_FOREACH(j, m->transaction_jobs, i) { + if (j->installed) continue; hashmap_remove(m->jobs, UINT32_TO_PTR(j->id)); @@ -378,7 +562,6 @@ rollback: return r; } - static int transaction_activate(Manager *m, JobMode mode) { int r; unsigned generation = 1; @@ -391,23 +574,52 @@ static int transaction_activate(Manager *m, JobMode mode) { /* First step: figure out which jobs matter */ transaction_find_jobs_that_matter_to_anchor(m, NULL, generation++); - /* Second step: let's merge entries we can merge */ - if ((r = transaction_merge_jobs(m)) < 0) - goto rollback; + /* Second step: Try not to stop any running services if + * we don't have to. Don't try to reverse running + * jobs if we don't have to. */ + transaction_minimize_impact(m); - /* Third step: verify order makes sense */ - if ((r = transaction_verify_order(m, &generation)) < 0) - goto rollback; + for (;;) { + /* Third step: Let's remove unneeded jobs that might + * be lurking. */ + transaction_collect_garbage(m); - /* Third step: do garbage colletion */ - transaction_collect_garbage(m); + /* Fourth step: verify order makes sense and correct + * cycles if necessary and possible */ + if ((r = transaction_verify_order(m, &generation)) >= 0) + break; + + if (r != -EAGAIN) + goto rollback; - /* Fourth step: check whether we can actually apply this */ + /* Let's see if the resulting transaction ordering + * graph is still cyclic... */ + } + + for (;;) { + /* Fifth step: let's drop unmergeable entries if + * necessary and possible, merge entries we can + * merge */ + if ((r = transaction_merge_jobs(m)) >= 0) + break; + + if (r != -EAGAIN) + goto rollback; + + /* Sixth step: an entry got dropped, let's garbage + * collect its dependencies. */ + transaction_collect_garbage(m); + + /* Let's see if the resulting transaction still has + * unmergeable entries ... */ + } + + /* Seventh step: check whether we can actually apply this */ if (mode == JOB_FAIL) if ((r = transaction_is_destructive(m, mode)) < 0) goto rollback; - /* Fifth step: apply changes */ + /* Eights step: apply changes */ if ((r = transaction_apply(m, mode)) < 0) goto rollback; @@ -421,21 +633,21 @@ rollback: return r; } -static Job* transaction_add_one_job(Manager *m, JobType type, Name *name, bool *is_new) { +static Job* transaction_add_one_job(Manager *m, JobType type, Unit *unit, bool force, bool *is_new) { Job *j, *f; int r; assert(m); - assert(name); + assert(unit); /* Looks for an axisting prospective job and returns that. If * it doesn't exist it is created and added to the prospective * jobs list. */ - f = hashmap_get(m->transaction_jobs, name); + f = hashmap_get(m->transaction_jobs, unit); - for (j = f; j; j = j->transaction_next) { - assert(j->name == name); + LIST_FOREACH(transaction, j, f) { + assert(j->unit == unit); if (j->type == type) { if (is_new) @@ -444,24 +656,22 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Name *name, bool * } } - if (name->meta.job && name->meta.job->type == type) - j = name->meta.job; - else if (!(j = job_new(m, type, name))) + if (unit->meta.job && unit->meta.job->type == type) + j = unit->meta.job; + else if (!(j = job_new(m, type, unit))) return NULL; - if ((r = hashmap_replace(m->transaction_jobs, name, j)) < 0) { - job_free(j); - return NULL; - } - - j->transaction_next = f; - - if (f) - f->transaction_prev = j; - j->generation = 0; j->marker = NULL; j->matters_to_anchor = false; + j->forced = force; + + LIST_PREPEND(Job, transaction, f, j); + + if ((r = hashmap_replace(m->transaction_jobs, unit, f)) < 0) { + job_free(j); + return NULL; + } if (is_new) *is_new = true; @@ -469,16 +679,16 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Name *name, bool * return j; } -void manager_transaction_delete_job(Manager *m, Job *j) { +void manager_transaction_unlink_job(Manager *m, Job *j) { assert(m); assert(j); if (j->transaction_prev) j->transaction_prev->transaction_next = j->transaction_next; else if (j->transaction_next) - hashmap_replace(m->transaction_jobs, j->name, j->transaction_next); + hashmap_replace(m->transaction_jobs, j->unit, j->transaction_next); else - hashmap_remove_value(m->transaction_jobs, j->name, j); + hashmap_remove_value(m->transaction_jobs, j->unit, j); if (j->transaction_next) j->transaction_next->transaction_prev = j->transaction_prev; @@ -487,23 +697,40 @@ void manager_transaction_delete_job(Manager *m, Job *j) { while (j->subject_list) job_dependency_free(j->subject_list); - while (j->object_list) + + while (j->object_list) { + Job *other = j->object_list->matters ? j->object_list->subject : NULL; + job_dependency_free(j->object_list); + + if (other) { + log_debug("Deleting job %s/%s as dependency of job %s/%s", + unit_id(other->unit), job_type_to_string(other->type), + unit_id(j->unit), job_type_to_string(j->type)); + transaction_delete_job(m, other); + } + } } -static int transaction_add_job_and_dependencies(Manager *m, JobType type, Name *name, Job *by, bool matters, bool force, Job **_ret) { +static int transaction_add_job_and_dependencies(Manager *m, JobType type, Unit *unit, Job *by, bool matters, bool force, Job **_ret) { Job *ret; - void *state; - Name *dep; + Iterator i; + Unit *dep; int r; bool is_new; assert(m); assert(type < _JOB_TYPE_MAX); - assert(name); + assert(unit); + + if (unit->meta.load_state != UNIT_LOADED) + return -EINVAL; + + if (!unit_job_is_applicable(unit, type)) + return -EBADR; /* First add the job. */ - if (!(ret = transaction_add_one_job(m, type, name, &is_new))) + if (!(ret = transaction_add_one_job(m, type, unit, force, &is_new))) return -ENOMEM; /* Then, add a link to the job. */ @@ -513,29 +740,29 @@ static int transaction_add_job_and_dependencies(Manager *m, JobType type, Name * if (is_new) { /* Finally, recursively add in all dependencies. */ if (type == JOB_START || type == JOB_RELOAD_OR_START) { - SET_FOREACH(dep, ret->name->meta.dependencies[NAME_REQUIRES], state) - if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, true, force, NULL)) < 0) + SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRES], i) + if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, true, force, NULL)) < 0 && r != -EBADR) goto fail; - SET_FOREACH(dep, ret->name->meta.dependencies[NAME_SOFT_REQUIRES], state) - if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !force, force, NULL)) < 0) + SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_SOFT_REQUIRES], i) + if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !force, force, NULL)) < 0 && r != -EBADR) goto fail; - SET_FOREACH(dep, ret->name->meta.dependencies[NAME_WANTS], state) - if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, force, NULL)) < 0) + SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_WANTS], i) + if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, force, NULL)) < 0 && r != -EBADR) goto fail; - SET_FOREACH(dep, ret->name->meta.dependencies[NAME_REQUISITE], state) - if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_STARTED, dep, ret, true, force, NULL)) < 0) + SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE], i) + if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, true, force, NULL)) < 0 && r != -EBADR) goto fail; - SET_FOREACH(dep, ret->name->meta.dependencies[NAME_SOFT_REQUISITE], state) - if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_STARTED, dep, ret, !force, force, NULL)) < 0) + SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_SOFT_REQUISITE], i) + if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, !force, force, NULL)) < 0 && r != -EBADR) goto fail; - SET_FOREACH(dep, ret->name->meta.dependencies[NAME_CONFLICTS], state) - if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, true, force, NULL)) < 0) + SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_CONFLICTS], i) + if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, true, force, NULL)) < 0 && r != -EBADR) goto fail; } else if (type == JOB_STOP || type == JOB_RESTART || type == JOB_TRY_RESTART) { - SET_FOREACH(dep, ret->name->meta.dependencies[NAME_REQUIRED_BY], state) - if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, force, NULL)) < 0) + SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRED_BY], i) + if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, force, NULL)) < 0 && r != -EBADR) goto fail; } @@ -548,16 +775,16 @@ fail: return r; } -int manager_add_job(Manager *m, JobType type, Name *name, JobMode mode, bool force, Job **_ret) { +int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool force, Job **_ret) { int r; Job *ret; assert(m); assert(type < _JOB_TYPE_MAX); - assert(name); + assert(unit); assert(mode < _JOB_MODE_MAX); - if ((r = transaction_add_job_and_dependencies(m, type, name, NULL, true, force, &ret))) { + if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, force, &ret))) { transaction_abort(m); return r; } @@ -577,114 +804,99 @@ Job *manager_get_job(Manager *m, uint32_t id) { return hashmap_get(m->jobs, UINT32_TO_PTR(id)); } -Name *manager_get_name(Manager *m, const char *name) { +Unit *manager_get_unit(Manager *m, const char *name) { assert(m); assert(name); - return hashmap_get(m->names, name); + return hashmap_get(m->units, name); } -static int dispatch_load_queue(Manager *m) { +static void dispatch_load_queue(Manager *m) { Meta *meta; assert(m); /* Make sure we are not run recursively */ if (m->dispatching_load_queue) - return 0; + return; m->dispatching_load_queue = true; - /* Dispatches the load queue. Takes a name from the queue and + /* Dispatches the load queue. Takes a unit from the queue and * tries to load its data until the queue is empty */ while ((meta = m->load_queue)) { - name_load(NAME(meta)); - LIST_REMOVE(Meta, m->load_queue, meta); + assert(meta->in_load_queue); + + unit_load(UNIT(meta)); } m->dispatching_load_queue = false; - - return 0; } -int manager_load_name(Manager *m, const char *name, Name **_ret) { - Name *ret; - NameType t; +int manager_load_unit(Manager *m, const char *path, Unit **_ret) { + Unit *ret; int r; - char *n; + const char *name; assert(m); - assert(name); + assert(path); assert(_ret); - if (!name_is_valid(name)) - return -EINVAL; - /* This will load the service information files, but not actually - * start any services or anything */ - - if ((ret = manager_get_name(m, name))) - goto finish; - - if ((t = name_type_from_string(name)) == _NAME_TYPE_INVALID) - return -EINVAL; - - if (!(ret = name_new(m))) - return -ENOMEM; + * start any services or anything. */ - ret->meta.type = t; + name = file_name_from_path(path); - if (!(n = strdup(name))) { - name_free(ret); - return -ENOMEM; + if ((ret = manager_get_unit(m, name))) { + *_ret = ret; + return 0; } - if (set_put(ret->meta.names, n) < 0) { - name_free(ret); - free(n); + if (!(ret = unit_new(m))) return -ENOMEM; + + if (is_path(path)) { + if (!(ret->meta.load_path = strdup(path))) { + unit_free(ret); + return -ENOMEM; + } } - if ((r = name_link(ret)) < 0) { - name_free(ret); + if ((r = unit_add_name(ret, name)) < 0) { + unit_free(ret); return r; } - /* At this point the new entry is created and linked. However, - * not loaded. Now load this entry and all its dependencies - * recursively */ - + unit_add_to_load_queue(ret); dispatch_load_queue(m); -finish: - *_ret = ret; return 0; } void manager_dump_jobs(Manager *s, FILE *f, const char *prefix) { - void *state; + Iterator i; Job *j; assert(s); assert(f); - HASHMAP_FOREACH(j, s->jobs, state) + HASHMAP_FOREACH(j, s->jobs, i) job_dump(j, f, prefix); } -void manager_dump_names(Manager *s, FILE *f, const char *prefix) { - void *state; - Name *n; +void manager_dump_units(Manager *s, FILE *f, const char *prefix) { + Iterator i; + Unit *u; const char *t; assert(s); assert(f); - HASHMAP_FOREACH_KEY(n, t, s->names, state) - if (name_id(n) == t) - name_dump(n, f, prefix); + HASHMAP_FOREACH_KEY(u, t, s->units, i) + if (unit_id(u) == t) + unit_dump(u, f, prefix); } void manager_clear_jobs(Manager *m) { @@ -697,3 +909,156 @@ void manager_clear_jobs(Manager *m) { while ((j = hashmap_first(m->jobs))) job_free(j); } + +void manager_dispatch_run_queue(Manager *m) { + Job *j; + + if (m->dispatching_run_queue) + return; + + m->dispatching_run_queue = true; + + while ((j = m->run_queue)) { + assert(j->installed); + assert(j->in_run_queue); + + job_run_and_invalidate(j); + } + + m->dispatching_run_queue = false; +} + +static int manager_dispatch_sigchld(Manager *m) { + assert(m); + + for (;;) { + siginfo_t si; + Unit *u; + + zero(si); + if (waitid(P_ALL, 0, &si, WNOHANG) < 0) + return -errno; + + if (si.si_pid == 0) + break; + + if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED) + continue; + + if (!(u = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid)))) + continue; + + UNIT_VTABLE(u)->sigchld_event(u, si.si_pid, si.si_code, si.si_status); + } + + return 0; +} + +static int manager_process_signal_fd(Manager *m) { + ssize_t n; + struct signalfd_siginfo sfsi; + bool sigchld = false; + + assert(m); + + for (;;) { + if ((n = read(m->signal_fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) { + + if (n >= 0) + return -EIO; + + if (errno == EAGAIN) + return 0; + + return -errno; + } + + if (sfsi.ssi_signo == SIGCHLD) + sigchld = true; + } + + if (sigchld) + return manager_dispatch_sigchld(m); + + return 0; +} + +static int process_event(Manager *m, struct epoll_event *ev) { + int r; + + assert(m); + assert(ev); + + switch (ev->data.u32) { + + case MANAGER_SIGNAL: + assert(ev->data.fd == m->signal_fd); + + /* An incoming signal? */ + if (ev->events != POLLIN) + return -EINVAL; + + if ((r = manager_process_signal_fd(m)) < 0) + return -r; + + break; + + case MANAGER_FD: { + Unit *u; + + /* Some fd event, to be dispatched to the units */ + assert_se(u = ev->data.ptr); + UNIT_VTABLE(u)->fd_event(u, ev->data.fd, ev->events); + break; + } + + case MANAGER_TIMER: { + Unit *u; + uint64_t v; + ssize_t k; + + /* Some timer event, to be dispatched to the units */ + if ((k = read(ev->data.fd, &v, sizeof(v))) != sizeof(v)) { + + if (k < 0 && (errno == EINTR || errno == EAGAIN)) + break; + + return k < 0 ? -errno : -EIO; + } + + assert_se(u = ev->data.ptr); + UNIT_VTABLE(u)->timer_event(u, ev->data.fd, v); + break; + } + + default: + assert_not_reached("Unknown epoll event type."); + } + + return 0; +} + +int manager_loop(Manager *m) { + int r; + + assert(m); + + for (;;) { + struct epoll_event events[32]; + int n, i; + + manager_dispatch_run_queue(m); + + if ((n = epoll_wait(m->epoll_fd, events, ELEMENTSOF(events), -1)) < 0) { + + if (errno == -EINTR) + continue; + + return -errno; + } + + for (i = 0; i < n; i++) + if ((r = process_event(m, events + i)) < 0) + return r; + } +}