X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.c;h=90e17b2497078cd38905649790aac69efedd9969;hp=41124fff8972999aef1b4c580afd238037cac51a;hb=44d8db9e5aa86165c97289f6c78a7e42bac78362;hpb=1e198baf11cd0c34ef0c6f326c8a75b046552a33 diff --git a/manager.c b/manager.c index 41124fff8..90e17b249 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,10 +18,14 @@ Manager* manager_new(void) { Manager *m; + sigset_t mask; + struct epoll_event ev; if (!(m = new0(Manager, 1))) return NULL; + m->signal_fd = m->epoll_fd = -1; + if (!(m->names = hashmap_new(string_hash_func, string_compare_func))) goto fail; @@ -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: @@ -47,10 +77,38 @@ void manager_free(Manager *m) { hashmap_free(m->names); 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->linked) + job_free(j); +} + +static void transaction_delete_name(Manager *m, Name *n) { + Job *j; + + /* Deletes all jobs associated with a certain name from the + * transaction */ + + while ((j = hashmap_get(m->transaction_jobs, n))) + transaction_delete_job(m, j); +} + static void transaction_abort(Manager *m) { Job *j; @@ -58,7 +116,7 @@ static void transaction_abort(Manager *m) { while ((j = hashmap_first(m->transaction_jobs))) if (j->linked) - manager_transaction_delete_job(m, j); + transaction_delete_job(m, j); else job_free(j); @@ -71,7 +129,17 @@ 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 names + * 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) @@ -88,40 +156,6 @@ 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; @@ -130,14 +164,17 @@ static void transaction_merge_and_delete_job(Manager *m, Job *j, Job *other, Job assert(j->name == other->name); assert(!j->linked); + /* 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,23 +207,92 @@ 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", name_id(d->name), 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->name->meta.job) + job_type_merge(&t, j->name->meta.job->type); /* Might fail. Which is OK */ while ((k = j->transaction_next)) { if (j->linked) { @@ -203,26 +309,51 @@ static int transaction_merge_jobs(Manager *m) { return 0; } +static bool name_matters_to_anchor(Name *n, Job *j) { + assert(n); + assert(!j->transaction_prev); + + /* Checks whether at least one of the jobs for this name + * 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; + Iterator i; Name *n; 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->linked && + !name_matters_to_anchor(k->name, k)) { + /* Ok, we can drop this one, so let's + * do so. */ + log_debug("Breaking order cycle by deleting job %s/%s", name_id(k->name), job_type_to_string(k->type)); + transaction_delete_name(m, k->name); return -EAGAIN; } @@ -232,19 +363,25 @@ 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 + /* We assume that the the dependencies are bidirectional, and * hence can ignore NAME_AFTER */ - - SET_FOREACH(n, j->name->meta.dependencies[NAME_BEFORE], state) { + SET_FOREACH(n, j->name->meta.dependencies[NAME_BEFORE], i) { Job *o; + /* Is there a job for this name? */ if (!(o = hashmap_get(m->transaction_jobs, n))) + + /* Ok, there is no job for this in the + * transaction, but maybe there is already one + * running? */ if (!(o = n->meta.job)) continue; @@ -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; - - HASHMAP_FOREACH(j, m->transaction_jobs, state) { + /* Check if the ordering graph is cyclic. If it is, try to fix + * that up by dropping one of the jobs. */ - /* 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", name_id(j->name), 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,19 +445,74 @@ 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->name->meta.job && + j->name->meta.job != j && + !job_type_is_superset(j->type, j->name->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 || NAME_IS_INACTIVE_OR_DEACTIVATING(name_active_state(j->name))) && + (!j->name->meta.job || job_type_is_conflicting(j->type, j->name->meta.job->state))) + continue; + + /* Ok, let's get rid of this */ + log_debug("Deleting %s/%s to minimize impact", name_id(j->name), 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) { + /* 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->linked) continue; @@ -364,11 +542,13 @@ static int transaction_apply(Manager *m, JobMode mode) { job_dependency_free(j->object_list); } + m->transaction_anchor = NULL; + return 0; rollback: - HASHMAP_FOREACH(j, m->transaction_jobs, state) { + HASHMAP_FOREACH(j, m->transaction_jobs, i) { if (j->linked) continue; @@ -378,7 +558,6 @@ rollback: return r; } - static int transaction_activate(Manager *m, JobMode mode) { int r; unsigned generation = 1; @@ -391,23 +570,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); + + /* Fourth step: verify order makes sense and correct + * cycles if necessary and possible */ + if ((r = transaction_verify_order(m, &generation)) >= 0) + break; - /* Third step: do garbage colletion */ - transaction_collect_garbage(m); + if (r != -EAGAIN) + goto rollback; + + /* 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); - /* Fourth step: check whether we can actually apply this */ + /* 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,7 +629,7 @@ 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, Name *name, bool force, bool *is_new) { Job *j, *f; int r; @@ -434,7 +642,7 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Name *name, bool * f = hashmap_get(m->transaction_jobs, name); - for (j = f; j; j = j->transaction_next) { + LIST_FOREACH(transaction, j, f) { assert(j->name == name); if (j->type == type) { @@ -449,19 +657,17 @@ static Job* transaction_add_one_job(Manager *m, JobType type, Name *name, bool * else if (!(j = job_new(m, type, name))) 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, name, f)) < 0) { + job_free(j); + return NULL; + } if (is_new) *is_new = true; @@ -469,7 +675,7 @@ 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); @@ -494,15 +700,17 @@ void manager_transaction_delete_job(Manager *m, Job *j) { job_dependency_free(j->object_list); if (other) { - log_debug("Deleting job %s, as dependency of job %s", name_id(j->name), name_id(other->name)); - manager_transaction_delete_job(m, other); + log_debug("Deleting job %s/%s as dependency of job %s/%s", + name_id(other->name), job_type_to_string(other->type), + name_id(j->name), 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) { Job *ret; - void *state; + Iterator i; Name *dep; int r; bool is_new; @@ -511,8 +719,14 @@ static int transaction_add_job_and_dependencies(Manager *m, JobType type, Name * assert(type < _JOB_TYPE_MAX); assert(name); + if (name->meta.load_state != NAME_LOADED) + return -EINVAL; + + if (!name_job_is_applicable(name, 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, name, force, &is_new))) return -ENOMEM; /* Then, add a link to the job. */ @@ -522,29 +736,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->name->meta.dependencies[NAME_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->name->meta.dependencies[NAME_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->name->meta.dependencies[NAME_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->name->meta.dependencies[NAME_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->name->meta.dependencies[NAME_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->name->meta.dependencies[NAME_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->name->meta.dependencies[NAME_REQUIRED_BY], i) + if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, force, NULL)) < 0 && r != -EBADR) goto fail; } @@ -593,14 +807,14 @@ Name *manager_get_name(Manager *m, const char *name) { return hashmap_get(m->names, 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; @@ -608,51 +822,37 @@ static int dispatch_load_queue(Manager *m) { * tries to load its data until the queue is empty */ while ((meta = m->load_queue)) { + assert(meta->linked); + assert(meta->in_load_queue); + name_load(NAME(meta)); - LIST_REMOVE(Meta, m->load_queue, meta); } m->dispatching_load_queue = false; - - return 0; } int manager_load_name(Manager *m, const char *name, Name **_ret) { Name *ret; - NameType t; int r; - char *n; assert(m); assert(name); 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 = manager_get_name(m, name))) { + *_ret = ret; + return 0; + } if (!(ret = name_new(m))) return -ENOMEM; - ret->meta.type = t; - - if (!(n = strdup(name))) { - name_free(ret); - return -ENOMEM; - } - - if (set_put(ret->meta.names, n) < 0) { + if ((r = name_add_name(ret, name)) < 0) { name_free(ret); - free(n); - return -ENOMEM; + return r; } if ((r = name_link(ret)) < 0) { @@ -660,38 +860,36 @@ int manager_load_name(Manager *m, const char *name, Name **_ret) { return r; } - /* At this point the new entry is created and linked. However, + /* At this point the new entry is created and linked. However * not loaded. Now load this entry and all its dependencies * recursively */ 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; + Iterator i; Name *n; const char *t; assert(s); assert(f); - HASHMAP_FOREACH_KEY(n, t, s->names, state) + HASHMAP_FOREACH_KEY(n, t, s->names, i) if (name_id(n) == t) name_dump(n, f, prefix); } @@ -706,3 +904,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->linked); + 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; + Name *n; + + 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 (!(n = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid)))) + continue; + + NAME_VTABLE(n)->sigchld_event(n, 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: { + Name *n; + + /* Some fd event, to be dispatched to the names */ + assert_se(n = ev->data.ptr); + NAME_VTABLE(n)->fd_event(n, ev->data.fd, ev->events); + break; + } + + case MANAGER_TIMER: { + Name *n; + uint64_t u; + ssize_t k; + + /* Some timer event, to be dispatched to the names */ + if ((k = read(ev->data.fd, &u, sizeof(u))) != sizeof(u)) { + + if (k < 0 && (errno == EINTR || errno == EAGAIN)) + break; + + return k < 0 ? -errno : -EIO; + } + + assert_se(n = ev->data.ptr); + NAME_VTABLE(n)->timer_event(n, ev->data.fd, u); + 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; + } +}