Merge lp:~afrantzis/mir/fix-1418002-slow-valgrind into lp:mir

[Alexandros Frantzis]

tests: Avoid busy loops to decrease runtime under valgrind

tests: Avoid busy loops to decrease runtime under valgrind

[Daniel van Vugt (vanvugt)]

Approved. But is this a fix for the bug or just related?

review: Approve

[Alexandros Frantzis (afrantzis)]

> Approved. But is this a fix for the bug or just related?

It's a fix for this bug, in the sense that it fixes an effect of the change in compositing behavior. That being said, that behavior is inefficient/wrong, see https://bugs.launchpad.net/mir/+bug/1418081 .

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2291
http://jenkins.qa.ubuntu.com/job/mir-ci/2911/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/908
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/908/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1164
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4209
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17763

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK for now, I guess.

review: Approve

=== modified file 'tests/include/mir_test_doubles/null_display_buffer_compositor_factory.h'
--- tests/include/mir_test_doubles/null_display_buffer_compositor_factory.h	2015-01-21 07:34:50 +0000
+++ tests/include/mir_test_doubles/null_display_buffer_compositor_factory.h	2015-02-04 14:00:51 +0000
@@ -22,6 +22,8 @@
 #include "mir/compositor/display_buffer_compositor_factory.h"
 #include "mir/compositor/display_buffer_compositor.h"
 
+#include <thread>
+
 namespace mir
 {
 namespace test
@@ -37,7 +39,12 @@
     {
         struct NullDisplayBufferCompositor : compositor::DisplayBufferCompositor
         {
-            void composite(compositor::SceneElementSequence&&) {}
+            void composite(compositor::SceneElementSequence&&)
+            {
+                // yield() is needed to ensure reasonable runtime under
+                // valgrind for some tests
+                std::this_thread::yield();
+            }
         };
 
         auto raw = new NullDisplayBufferCompositor{};

=== modified file 'tests/unit-tests/compositor/test_multi_threaded_compositor.cpp'
--- tests/unit-tests/compositor/test_multi_threaded_compositor.cpp	2015-01-22 09:55:39 +0000
+++ tests/unit-tests/compositor/test_multi_threaded_compositor.cpp	2015-02-04 14:00:51 +0000
@@ -31,6 +31,7 @@
 #include "mir_test_doubles/mock_compositor_report.h"
 #include "mir_test_doubles/mock_scene.h"
 #include "mir_test_doubles/stub_scene.h"
+#include "mir_test_doubles/null_display_buffer_compositor_factory.h"
 
 #include <boost/throw_exception.hpp>
 
@@ -312,23 +313,6 @@
     unsigned int render_count;
 };
 
-class NullDisplayBufferCompositorFactory : public mc::DisplayBufferCompositorFactory
-{
-public:
-    std::unique_ptr<mc::DisplayBufferCompositor> create_compositor_for(mg::DisplayBuffer&)
-    {
-        struct NullDisplayBufferCompositor : mc::DisplayBufferCompositor
-        {
-            void composite(mc::SceneElementSequence&&) override
-            {
-            }
-        };
-
-        auto raw = new NullDisplayBufferCompositor{};
-        return std::unique_ptr<NullDisplayBufferCompositor>(raw);
-    }
-};
-
 class ThreadNameDisplayBufferCompositorFactory : public mc::DisplayBufferCompositorFactory
 {
 public:
@@ -650,7 +634,7 @@
 
     auto display = std::make_shared<StubDisplayWithMockBuffers>(nbuffers);
     auto scene = std::make_shared<StubScene>();
-    auto db_compositor_factory = std::make_shared<NullDisplayBufferCompositorFactory>();
+    auto db_compositor_factory = std::make_shared<mtd::NullDisplayBufferCompositorFactory>();
     mc::MultiThreadedCompositor compositor{display, scene, db_compositor_factory, null_report, true};
 
     display->for_each_mock_buffer([](mtd::MockDisplayBuffer& mock_buf)
@@ -672,7 +656,7 @@
     unsigned int const nbuffers{3};
     auto display = std::make_shared<StubDisplayWithMockBuffers>(nbuffers);
     auto mock_scene = std::make_shared<mtd::MockScene>();
-    auto db_compositor_factory = std::make_shared<NullDisplayBufferCompositorFactory>();
+    auto db_compositor_factory = std::make_shared<mtd::NullDisplayBufferCompositorFactory>();
     auto mock_report = std::make_shared<testing::NiceMock<mtd::MockCompositorReport>>();
 
     EXPECT_CALL(*mock_report, started())
@@ -775,7 +759,7 @@
     unsigned int const nbuffers{3};
     auto display = std::make_shared<StubDisplayWithMockBuffers>(nbuffers);
     auto mock_scene = std::make_shared<NiceMock<mtd::MockScene>>();
-    auto db_compositor_factory = std::make_shared<NullDisplayBufferCompositorFactory>();
+    auto db_compositor_factory = std::make_shared<mtd::NullDisplayBufferCompositorFactory>();
     auto mock_report = std::make_shared<testing::NiceMock<mtd::MockCompositorReport>>();
 
     EXPECT_CALL(*mock_scene, register_compositor(_))