Merge lp:~afrantzis/unity-system-compositor/no-external-spinner-zombie-processes-sigchld into lp:unity-system-compositor

[Alexandros Frantzis]

Don't leave zombie spinner processes

Don't leave zombie spinner processes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/242/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/242/rebuild

review: Approve (continuous-integration)

Unmerged revisions

224. By Alexandros Frantzis on 2015-07-10

Don't leave zombie spinner processes

=== modified file 'src/external_spinner.cpp'
--- src/external_spinner.cpp	2015-04-01 17:06:16 +0000
+++ src/external_spinner.cpp	2015-07-10 12:07:43 +0000
@@ -20,6 +20,18 @@
 
 #include <unistd.h>
 #include <signal.h>
+#include <sys/wait.h>
+
+namespace
+{
+
+void wait_for_child(int)
+{
+    while (waitpid(-1, nullptr, WNOHANG) > 0)
+        continue;
+}
+
+}
 
 usc::ExternalSpinner::ExternalSpinner(
     std::string const& executable,
@@ -28,6 +40,11 @@
       mir_socket{mir_socket},
       spinner_pid{0}
 {
+    struct sigaction sa;
+    sigfillset(&sa.sa_mask);
+    sa.sa_handler = wait_for_child;
+    sa.sa_flags = 0;
+    sigaction(SIGCHLD, &sa, nullptr);
 }
 
 usc::ExternalSpinner::~ExternalSpinner()