#include "macro.h"
#include "strv.h"
#include "log.h"
+#include "util.h"
-Manager* manager_new(void) {
- Manager *m;
+static int manager_setup_signals(Manager *m) {
sigset_t mask;
struct epoll_event ev;
+ assert(m);
+
+ assert_se(reset_all_signal_handlers() == 0);
+
+ assert_se(sigemptyset(&mask) == 0);
+ assert_se(sigaddset(&mask, SIGCHLD) == 0);
+ assert_se(sigaddset(&mask, SIGINT) == 0); /* Kernel sends us this on control-alt-del */
+ assert_se(sigaddset(&mask, SIGWINCH) == 0); /* Kernel sends us this on kbrequest (alt-arrowup) */
+ assert_se(sigaddset(&mask, SIGTERM) == 0);
+ assert_se(sigaddset(&mask, SIGHUP) == 0);
+ assert_se(sigaddset(&mask, SIGUSR1) == 0);
+ assert_se(sigaddset(&mask, SIGUSR2) == 0);
+ assert_se(sigaddset(&mask, SIGPIPE) == 0);
+ assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+
+ m->signal_watch.type = WATCH_SIGNAL_FD;
+ if ((m->signal_watch.fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0)
+ return -errno;
+
+ zero(ev);
+ ev.events = EPOLLIN;
+ ev.data.ptr = &m->signal_watch;
+
+ if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->signal_watch.fd, &ev) < 0)
+ return -errno;
+
+ return 0;
+}
+
+Manager* manager_new(void) {
+ Manager *m;
+
if (!(m = new0(Manager, 1)))
return NULL;
- m->signal_fd = m->epoll_fd = -1;
+ m->signal_watch.fd = m->epoll_fd = -1;
- if (!(m->names = hashmap_new(string_hash_func, string_compare_func)))
+ if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
goto fail;
if (!(m->jobs = hashmap_new(trivial_hash_func, trivial_compare_func)))
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)
+ if (manager_setup_signals(m) < 0)
goto fail;
return m;
}
void manager_free(Manager *m) {
- Name *n;
+ UnitType c;
+ 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);
+
+ for (c = 0; c < _UNIT_TYPE_MAX; c++)
+ if (unit_vtable[c]->shutdown)
+ unit_vtable[c]->shutdown(m);
+
+ 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);
+ if (m->signal_watch.fd >= 0)
+ close_nointr(m->signal_watch.fd);
free(m);
}
+int manager_coldplug(Manager *m) {
+ int r;
+ UnitType c;
+ Iterator i;
+ Unit *u;
+ char *k;
+
+ assert(m);
+
+ /* First, let's ask every type to load all units from
+ * disk/kernel that it might know */
+ for (c = 0; c < _UNIT_TYPE_MAX; c++)
+ if (unit_vtable[c]->enumerate)
+ if ((r = unit_vtable[c]->enumerate(m)) < 0)
+ return r;
+
+ manager_dispatch_load_queue(m);
+
+ /* Then, let's set up their initial state. */
+ HASHMAP_FOREACH_KEY(u, k, m->units, i) {
+
+ /* ignore aliases */
+ if (unit_id(u) != k)
+ continue;
+
+ if (UNIT_VTABLE(u)->coldplug)
+ if ((r = UNIT_VTABLE(u)->coldplug(u)) < 0)
+ return r;
+ }
+
+ return 0;
+}
+
static void transaction_delete_job(Manager *m, Job *j) {
assert(m);
assert(j);
manager_transaction_unlink_job(m, j);
- if (!j->linked)
+ if (!j->installed)
job_free(j);
}
-static void transaction_delete_name(Manager *m, Name *n) {
+static void transaction_delete_unit(Manager *m, Unit *u) {
Job *j;
- /* Deletes all jobs associated with a certain name from the
+ /* Deletes all jobs associated with a certain unit from the
* transaction */
- while ((j = hashmap_get(m->transaction_jobs, n)))
+ while ((j = hashmap_get(m->transaction_jobs, u)))
transaction_delete_job(m, j);
}
+static void transaction_clean_dependencies(Manager *m) {
+ Iterator i;
+ Job *j;
+
+ assert(m);
+
+ /* Drops all dependencies of all installed jobs */
+
+ 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);
+}
+
static void transaction_abort(Manager *m) {
Job *j;
assert(m);
while ((j = hashmap_first(m->transaction_jobs)))
- if (j->linked)
+ if (j->installed)
transaction_delete_job(m, j);
else
job_free(j);
assert(hashmap_isempty(m->transaction_jobs));
- assert(!m->transaction_anchor);
+
+ transaction_clean_dependencies(m);
}
static void transaction_find_jobs_that_matter_to_anchor(Manager *m, Job *j, unsigned generation) {
assert(m);
- /* A recursive sweep through the graph that marks all names
+ /* 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. */
- for (l = j ? j->subject_list : m->transaction_anchor; l; l = l->subject_next) {
+ 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;
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. */
/* 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;
/* 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;
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));
+ 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;
}
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 */
+ 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
return 0;
}
-static bool name_matters_to_anchor(Name *n, Job *j) {
- assert(n);
+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 name
+ /* Checks whether at least one of the jobs for this unit
* matters to the anchor. */
LIST_FOREACH(transaction, j, j)
static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned generation) {
Iterator i;
- Name *n;
+ Unit *u;
int r;
assert(m);
for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) {
- if (!k->linked &&
- !name_matters_to_anchor(k->name, 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", name_id(k->name), job_type_to_string(k->type));
- transaction_delete_name(m, k->name);
+ 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;
}
j->generation = generation;
/* We assume that the the dependencies are bidirectional, and
- * hence can ignore NAME_AFTER */
- SET_FOREACH(n, j->name->meta.dependencies[NAME_BEFORE], i) {
+ * hence can ignore UNIT_AFTER */
+ SET_FOREACH(u, j->unit->meta.dependencies[UNIT_BEFORE], i) {
Job *o;
- /* Is there a job for this name? */
- if (!(o = hashmap_get(m->transaction_jobs, n)))
+ /* 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 = n->meta.job))
+ if (!(o = u->meta.job))
continue;
if ((r = transaction_verify_order_one(m, o, j, generation)) < 0)
if (j->object_list)
continue;
- log_debug("Garbage collecting job %s/%s", name_id(j->name), job_type_to_string(j->type));
+ 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;
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))
+ if (j->unit->meta.job &&
+ j->unit->meta.job != j &&
+ !job_type_is_superset(j->type, j->unit->meta.job->type))
return -EEXIST;
}
/* 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)))
+ 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", name_id(j->name), job_type_to_string(j->type));
+ 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;
assert(!j->transaction_prev);
assert(!j->transaction_next);
- if (j->linked)
+ if (j->installed)
continue;
if ((r = hashmap_put(m->jobs, UINT32_TO_PTR(j->id), j)) < 0)
}
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. */
assert(!j->transaction_next);
assert(!j->transaction_prev);
- while (j->subject_list)
- job_dependency_free(j->subject_list);
- while (j->object_list)
- job_dependency_free(j->object_list);
+ job_schedule_run(j);
}
- m->transaction_anchor = NULL;
+ /* As last step, kill all remaining job dependencies. */
+ transaction_clean_dependencies(m);
return 0;
rollback:
HASHMAP_FOREACH(j, m->transaction_jobs, i) {
- if (j->linked)
+ if (j->installed)
continue;
hashmap_remove(m->jobs, UINT32_TO_PTR(j->id));
return r;
}
-static Job* transaction_add_one_job(Manager *m, JobType type, Name *name, bool force, 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);
LIST_FOREACH(transaction, j, f) {
- assert(j->name == name);
+ assert(j->unit == unit);
if (j->type == type) {
if (is_new)
}
}
- 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;
j->generation = 0;
LIST_PREPEND(Job, transaction, f, j);
- if ((r = hashmap_replace(m->transaction_jobs, name, f)) < 0) {
+ if ((r = hashmap_replace(m->transaction_jobs, unit, f)) < 0) {
job_free(j);
return NULL;
}
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;
if (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));
+ 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;
Iterator i;
- Name *dep;
+ Unit *dep;
int r;
bool is_new;
assert(m);
assert(type < _JOB_TYPE_MAX);
- assert(name);
+ assert(unit);
- if (name->meta.load_state != NAME_LOADED)
+ if (unit->meta.load_state != UNIT_LOADED)
return -EINVAL;
- if (!name_job_is_applicable(name, type))
+ if (!unit_job_is_applicable(unit, type))
return -EBADR;
/* First add the job. */
- if (!(ret = transaction_add_one_job(m, type, name, force, &is_new)))
+ if (!(ret = transaction_add_one_job(m, type, unit, force, &is_new)))
return -ENOMEM;
/* Then, add a link to the job. */
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], i)
+ 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], i)
+ 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], i)
+ 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], i)
+ 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], i)
+ 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], i)
+ 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], i)
+ 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;
}
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;
}
if ((r = transaction_activate(m, mode)) < 0)
return r;
+ log_debug("Enqueued job %s/%s", unit_id(unit), job_type_to_string(type));
+
if (_ret)
*_ret = ret;
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 void dispatch_load_queue(Manager *m) {
+void manager_dispatch_load_queue(Manager *m) {
Meta *meta;
assert(m);
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)) {
- assert(meta->linked);
assert(meta->in_load_queue);
- name_load(NAME(meta));
+ unit_load(UNIT(meta));
}
m->dispatching_load_queue = false;
}
-int manager_load_name(Manager *m, const char *name, Name **_ret) {
- Name *ret;
+int manager_load_unit(Manager *m, const char *path, Unit **_ret) {
+ Unit *ret;
int r;
+ const char *name;
assert(m);
- assert(name);
+ assert(path);
assert(_ret);
/* This will load the service information files, but not actually
- * start any services or anything */
+ * start any services or anything. */
+
+ name = file_name_from_path(path);
- if ((ret = manager_get_name(m, name))) {
+ if ((ret = manager_get_unit(m, name))) {
*_ret = ret;
return 0;
}
- if (!(ret = name_new(m)))
+ if (!(ret = unit_new(m)))
return -ENOMEM;
- if ((r = name_add_name(ret, name)) < 0) {
- name_free(ret);
- return r;
+ 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 */
-
- dispatch_load_queue(m);
+ unit_add_to_load_queue(ret);
+ manager_dispatch_load_queue(m);
*_ret = ret;
return 0;
job_dump(j, f, prefix);
}
-void manager_dump_names(Manager *s, FILE *f, const char *prefix) {
+void manager_dump_units(Manager *s, FILE *f, const char *prefix) {
Iterator i;
- Name *n;
+ Unit *u;
const char *t;
assert(s);
assert(f);
- HASHMAP_FOREACH_KEY(n, t, s->names, i)
- 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) {
m->dispatching_run_queue = true;
while ((j = m->run_queue)) {
- assert(j->linked);
+ assert(j->installed);
assert(j->in_run_queue);
job_run_and_invalidate(j);
static int manager_dispatch_sigchld(Manager *m) {
assert(m);
+ log_debug("dispatching SIGCHLD");
+
for (;;) {
siginfo_t si;
- Name *n;
+ Unit *u;
zero(si);
- if (waitid(P_ALL, 0, &si, WNOHANG) < 0)
+ if (waitid(P_ALL, 0, &si, WEXITED|WNOHANG) < 0) {
+
+ if (errno == ECHILD)
+ break;
+
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))))
+ log_debug("child %llu died (code=%s, status=%i)", (long long unsigned) si.si_pid, sigchld_code(si.si_code), si.si_status);
+
+ if (!(u = 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);
+ 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) {
+static int manager_process_signal_fd(Manager *m, bool *quit) {
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 = read(m->signal_watch.fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
if (n >= 0)
return -EIO;
if (errno == EAGAIN)
- return 0;
+ break;
return -errno;
}
- if (sfsi.ssi_signo == SIGCHLD)
+ switch (sfsi.ssi_signo) {
+
+ case SIGCHLD:
sigchld = true;
+ break;
+
+ case SIGINT:
+ case SIGTERM:
+ *quit = true;
+ return 0;
+
+ default:
+ log_info("Got unhandled signal <%s>.", strsignal(sfsi.ssi_signo));
+ }
}
if (sigchld)
return 0;
}
-static int process_event(Manager *m, struct epoll_event *ev) {
+static int process_event(Manager *m, struct epoll_event *ev, bool *quit) {
int r;
+ Watch *w;
assert(m);
assert(ev);
- switch (ev->data.u32) {
+ assert(w = ev->data.ptr);
- case MANAGER_SIGNAL:
- assert(ev->data.fd == m->signal_fd);
+ switch (w->type) {
- /* An incoming signal? */
- if (ev->events != POLLIN)
- return -EINVAL;
+ case WATCH_SIGNAL_FD:
- if ((r = manager_process_signal_fd(m)) < 0)
- return -r;
+ /* An incoming signal? */
+ if (ev->events != POLLIN)
+ return -EINVAL;
- break;
+ if ((r = manager_process_signal_fd(m, quit)) < 0)
+ return r;
- case MANAGER_FD: {
- Name *n;
+ break;
- /* 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 WATCH_FD:
- case MANAGER_TIMER: {
- Name *n;
- uint64_t u;
- ssize_t k;
+ /* Some fd event, to be dispatched to the units */
+ UNIT_VTABLE(w->unit)->fd_event(w->unit, w->fd, ev->events, w);
+ break;
- /* Some timer event, to be dispatched to the names */
- if ((k = read(ev->data.fd, &u, sizeof(u))) != sizeof(u)) {
+ case WATCH_TIMER: {
+ uint64_t v;
+ ssize_t k;
- if (k < 0 && (errno == EINTR || errno == EAGAIN))
- break;
+ /* Some timer event, to be dispatched to the units */
+ if ((k = read(ev->data.fd, &v, sizeof(v))) != sizeof(v)) {
- return k < 0 ? -errno : -EIO;
- }
+ if (k < 0 && (errno == EINTR || errno == EAGAIN))
+ break;
- assert_se(n = ev->data.ptr);
- NAME_VTABLE(n)->timer_event(n, ev->data.fd, u);
- break;
+ return k < 0 ? -errno : -EIO;
}
- default:
- assert_not_reached("Unknown epoll event type.");
+ UNIT_VTABLE(w->unit)->timer_event(w->unit, v, w);
+ break;
+ }
+
+ default:
+ assert_not_reached("Unknown epoll event type.");
}
return 0;
int manager_loop(Manager *m) {
int r;
+ bool quit = false;
assert(m);
for (;;) {
- struct epoll_event events[32];
- int n, i;
+ struct epoll_event event;
+ int n;
manager_dispatch_run_queue(m);
- if ((n = epoll_wait(m->epoll_fd, events, ELEMENTSOF(events), -1)) < 0) {
+ if ((n = epoll_wait(m->epoll_fd, &event, 1, -1)) < 0) {
if (errno == -EINTR)
continue;
return -errno;
}
- for (i = 0; i < n; i++)
- if ((r = process_event(m, events + i)) < 0)
- return r;
+ assert(n == 1);
+
+ if ((r = process_event(m, &event, &quit)) < 0)
+ return r;
+
+ if (quit)
+ return 0;
}
}
~ianmdlvl / elogind.git / blobdiff