Merge lp:~vanvugt/mir/fix-1338902 into lp:mir

[Daniel van Vugt]

Fix crashing test: EventDistributorTest.succeeds_with_thread_delete_unregister
due to multiple mutex unlocks (LP: #1338902)

Also added a yield() to stop the test from taking forever under valgrind.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1751
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2093/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/861
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/867
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/860
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/614
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/614/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/612
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/612/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2713
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2713/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2007
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9449

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2093/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1752
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2096/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/870
    ABORTED: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/863/console
    None: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/618/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/615/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2731/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2096/rebuild

review: Needs Fixing (continuous-integration)

[Chris Halse Rogers (raof)]

This still seems to contain a race.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

The failure doesn't seem related to the branch. Try again...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1753
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/872
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/871
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/622
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/620
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/620/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2780/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2015
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9510

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2101/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

LGTM

review: Approve

=== modified file 'tests/unit-tests/client/test_event_distributor.cpp'
--- tests/unit-tests/client/test_event_distributor.cpp	2014-06-11 16:11:32 +0000
+++ tests/unit-tests/client/test_event_distributor.cpp	2014-07-09 06:07:45 +0000
@@ -107,12 +107,18 @@
         EventCatcher(mcl::EventDistributor* event_distributor)
         : event_distributor(event_distributor)
         {
+            locked = false;
             reg = event_distributor->register_event_handler(
                 [this](MirEvent const&)
                 {
-                    mutex.unlock();
+                    if (locked)
+                    {
+                        locked = false;
+                        mutex.unlock();
+                    }
                 });
             mutex.lock();
+            locked = true;
         }
         ~EventCatcher()
         {
@@ -122,6 +128,7 @@
 
         mcl::EventDistributor* event_distributor;
         int reg;
+        bool locked;
         std::mutex mutex;
     };
 
@@ -145,6 +152,7 @@
 
     while(!thread_done.woken()) {
         event_distributor.handle_event(e);
+        std::this_thread::yield();
     }
 
     thread.join();