chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trap some signals
[elogind.git]
/
manager.c
diff --git
a/manager.c
b/manager.c
index 3430b97bc10e7851ed791e1f36f733cec801ea8d..b3123f2b1d2d57ac29f02b55acac9cec704a42af 100644
(file)
--- a/
manager.c
+++ b/
manager.c
@@
-24,7
+24,7
@@
Manager* manager_new(void) {
if (!(m = new0(Manager, 1)))
return NULL;
if (!(m = new0(Manager, 1)))
return NULL;
- m->signal_fd = m->epoll_fd = -1;
+ m->signal_
watch.
fd = m->epoll_fd = -1;
if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
goto fail;
if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
goto fail;
@@
-43,16
+43,21
@@
Manager* manager_new(void) {
assert_se(sigemptyset(&mask) == 0);
assert_se(sigaddset(&mask, SIGCHLD) == 0);
assert_se(sigemptyset(&mask) == 0);
assert_se(sigaddset(&mask, SIGCHLD) == 0);
+ assert_se(sigaddset(&mask, SIGINT) == 0);
+ assert_se(sigaddset(&mask, SIGTERM) == 0);
+ assert_se(sigaddset(&mask, SIGWINCH) == 0);
+ assert_se(sigaddset(&mask, SIGHUP) == 0);
assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
- if ((m->signal_fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0)
+ m->signal_watch.type = WATCH_SIGNAL_FD;
+ if ((m->signal_watch.fd = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC)) < 0)
goto fail;
zero(ev);
ev.events = EPOLLIN;
goto fail;
zero(ev);
ev.events = EPOLLIN;
- ev.data.
fd = m->signal_fd
;
+ ev.data.
ptr = &m->signal_watch
;
- if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->signal_fd, &ev) < 0)
+ if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->signal_
watch.
fd, &ev) < 0)
goto fail;
return m;
goto fail;
return m;
@@
-81,8
+86,8
@@
void manager_free(Manager *m) {
if (m->epoll_fd >= 0)
close_nointr(m->epoll_fd);
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);
}
free(m);
}
@@
-555,6
+560,7
@@
static int transaction_apply(Manager *m, JobMode mode) {
assert(!j->transaction_next);
assert(!j->transaction_prev);
assert(!j->transaction_next);
assert(!j->transaction_prev);
+ job_schedule_run(j);
}
/* As last step, kill all remaining job dependencies. */
}
/* As last step, kill all remaining job dependencies. */
@@
-943,13
+949,20
@@
void manager_dispatch_run_queue(Manager *m) {
static int manager_dispatch_sigchld(Manager *m) {
assert(m);
static int manager_dispatch_sigchld(Manager *m) {
assert(m);
+ log_debug("dispatching SIGCHLD");
+
for (;;) {
siginfo_t si;
Unit *u;
zero(si);
for (;;) {
siginfo_t si;
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;
return -errno;
+ }
if (si.si_pid == 0)
break;
if (si.si_pid == 0)
break;
@@
-957,6
+970,8
@@
static int manager_dispatch_sigchld(Manager *m) {
if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED)
continue;
if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED)
continue;
+ 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;
if (!(u = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid))))
continue;
@@
-966,7
+981,7
@@
static int manager_dispatch_sigchld(Manager *m) {
return 0;
}
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;
ssize_t n;
struct signalfd_siginfo sfsi;
bool sigchld = false;
@@
-974,19
+989,31
@@
static int manager_process_signal_fd(Manager *m) {
assert(m);
for (;;) {
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)
if (n >= 0)
return -EIO;
if (errno == EAGAIN)
-
return 0
;
+
break
;
return -errno;
}
return -errno;
}
- if (sfsi.ssi_signo == SIGCHLD)
+ switch (sfsi.ssi_signo) {
+
+ case SIGCHLD:
sigchld = true;
sigchld = true;
+ break;
+
+ case SIGINT:
+ case SIGTERM:
+ *quit = true;
+ return 0;
+
+ default:
+ log_info("Got unhandled signal <%s>.", strsignal(sfsi.ssi_signo));
+ }
}
if (sigchld)
}
if (sigchld)
@@
-995,56
+1022,53
@@
static int manager_process_signal_fd(Manager *m) {
return 0;
}
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;
int r;
+ Watch *w;
assert(m);
assert(ev);
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: {
- Unit *u;
+ break;
- /* 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 WATCH_FD:
- case MANAGER_TIMER: {
- Unit *u;
- uint64_t v;
- 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 units */
- if ((k = read(ev->data.fd, &v, sizeof(v))) != sizeof(v)) {
+ 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(u = ev->data.ptr);
- UNIT_VTABLE(u)->timer_event(u, ev->data.fd, v);
- 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;
}
return 0;
@@
-1052,6
+1076,7
@@
static int process_event(Manager *m, struct epoll_event *ev) {
int manager_loop(Manager *m) {
int r;
int manager_loop(Manager *m) {
int r;
+ bool quit = false;
assert(m);
assert(m);
@@
-1069,8
+1094,12
@@
int manager_loop(Manager *m) {
return -errno;
}
return -errno;
}
- for (i = 0; i < n; i++)
- if ((r = process_event(m, events + i)) < 0)
+ for (i = 0; i < n; i++)
{
+ if ((r = process_event(m, events + i
, &quit
)) < 0)
return r;
return r;
+
+ if (quit)
+ return 0;
+ }
}
}
}
}