From: Lukáš Nykrýn <lnykryn@redhat.com>
Date: Sat, 16 Jul 2016 19:04:13 +0000 (+0200)
Subject: manager: don't skip sigchld handler for main and control pid for services (#3738)
X-Git-Tag: v231~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccc2c98e1b0c06861577632440b996ca16cefd53;p=thirdparty%2Fsystemd.git

manager: don't skip sigchld handler for main and control pid for services (#3738)

During stop when service has one "regular" pid one main pid and one
control pid and the sighld for the regular one is processed first the
unit_tidy_watch_pids will skip the main and control pid and does not
remove them from u->pids(). But then we skip the sigchld event because we
already did one in the iteration and there are two pids in u->pids.

v2: Use general unit_main_pid() and unit_control_pid() instead of
reaching directly to service structure.
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 902c2a0a27e..c69b797430a 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1729,7 +1729,10 @@ static void invoke_sigchld_event(Manager *m, Unit *u, const siginfo_t *si) {
         unit_unwatch_pid(u, si->si_pid);
 
         if (UNIT_VTABLE(u)->sigchld_event) {
-                if (set_size(u->pids) <= 1 || iteration != u->sigchldgen) {
+                if (set_size(u->pids) <= 1 ||
+                    iteration != u->sigchldgen ||
+                    unit_main_pid(u) == si->si_pid ||
+                    unit_control_pid(u) == si->si_pid) {
                         UNIT_VTABLE(u)->sigchld_event(u, si->si_pid, si->si_code, si->si_status);
                         u->sigchldgen = iteration;
                 } else