Merge lp:~albaguirre/mir/fix-1473869 into lp:mir

[Alberto Aguirre]

Workaround for static alarm objects which are destroyed after the server is destroyed.

Workaround for static alarm objects which are destroyed after the server is destroyed.

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Kevin DuBois (kdub)]

hmm, lgtm as a workaround, although maybe we should file another lower-priority bug so we remember to fix the source of the problem with the glib loop

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2755
http://jenkins.qa.ubuntu.com/job/mir-ci/4349/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3204
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/498
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/498/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3152
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5956
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21964

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4349/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/server_example_test_client.cpp'
--- examples/server_example_test_client.cpp	2015-04-28 07:54:10 +0000
+++ examples/server_example_test_client.cpp	2015-07-17 20:37:09 +0000
@@ -107,14 +107,22 @@
             }
             else if (pid > 0)
             {
-                static auto const kill_action = server.the_main_loop()->create_alarm(
-                    [pid]{ kill(pid, SIGTERM); });
+                //FIXME: These alarm objects outlive the server - their destructor is called after the server is destroyed.
+                //The alarm destructor implementation reference glib objects that are assumed to exist which leads to crashes.
+                //For now, as a workaround, canceling the alarm will release such internal resources
+                static std::unique_ptr<mir::time::Alarm> const kill_action = server.the_main_loop()->create_alarm(
+                    [pid]
+                    {
+                        kill_action->cancel();
+                        kill(pid, SIGTERM);
+                    });
 
-                static auto const exit_action = server.the_main_loop()->create_alarm(
+                static std::unique_ptr<mir::time::Alarm> const exit_action = server.the_main_loop()->create_alarm(
                     [pid, &server, &test_failed]
                     {
                         if (!exit_success(pid))
                             test_failed = true;
+                        exit_action->cancel();
                         server.stop();
                     });