Merge lp:~vanvugt/mir/enhance-ClientLatency-tests-2 into lp:mir

[Daniel van Vugt]

Add ClientLatency tests for mir_buffer_stream_swap_buffers, since the
existing ones only test mir_buffer_stream_swap_buffers_sync.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3898
https://mir-jenkins.ubuntu.com/job/mir-ci/2468/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3220
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3287
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3279
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3279
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3279
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3249
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3249/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3249
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3249/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3249
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3249/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3249
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3249/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3249
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3249/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3249
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3249/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2468/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Umm ok

review: Approve

=== modified file 'tests/acceptance-tests/test_latency.cpp'
--- tests/acceptance-tests/test_latency.cpp	2016-12-21 08:59:11 +0000
+++ tests/acceptance-tests/test_latency.cpp	2016-12-21 08:59:11 +0000
@@ -353,6 +353,72 @@
         display.group.dump_latency();
 }
 
+TEST_F(ClientLatency, average_async_swap_latency_is_less_than_nbuffers)
+{
+    auto stream = mir_surface_get_buffer_stream(surface);
+    auto const deadline = steady_clock::now() + 60s;
+
+    while (stats.frames_composited() < test_frames &&
+           steady_clock::now() < deadline)
+    {
+        auto submission_id = mir_debug_surface_current_buffer_id(surface);
+        stats.record_submission(submission_id);
+        mir_wait_for(mir_buffer_stream_swap_buffers(stream, NULL, NULL));
+    }
+
+    ASSERT_THAT(stats.frames_composited(), Ge(test_frames));
+
+    if (server.get_options()->get<bool>(mtd::logging_opt))
+        display.group.dump_latency();
+
+    auto average_latency = display.group.average_latency();
+
+    EXPECT_THAT(average_latency, Lt(expected_client_buffers));
+}
+
+TEST_F(ClientLatency, max_async_swap_latency_is_limited_to_nbuffers)
+{
+    auto stream = mir_surface_get_buffer_stream(surface);
+    auto const deadline = steady_clock::now() + 60s;
+
+    while (stats.frames_composited() < test_frames &&
+           steady_clock::now() < deadline)
+    {
+        auto submission_id = mir_debug_surface_current_buffer_id(surface);
+        stats.record_submission(submission_id);
+        mir_wait_for(mir_buffer_stream_swap_buffers(stream, NULL, NULL));
+    }
+
+    ASSERT_THAT(stats.frames_composited(), Ge(test_frames));
+
+    auto max_latency = display.group.max_latency();
+    EXPECT_THAT(max_latency, Le(expected_client_buffers));
+}
+
+TEST_F(ClientLatency, async_swap_dropping_latency_is_closer_to_zero_than_one)
+{
+    auto stream = mir_surface_get_buffer_stream(surface);
+    mir_buffer_stream_set_swapinterval(stream, 0);
+    stats.swap_interval = 0;
+    auto const deadline = steady_clock::now() + 60s;
+
+    while (stats.frames_composited() < test_frames &&
+           steady_clock::now() < deadline)
+    {
+        auto submission_id = mir_debug_surface_current_buffer_id(surface);
+        stats.record_submission(submission_id);
+        mir_wait_for(mir_buffer_stream_swap_buffers(stream, NULL, NULL));
+    }
+
+    ASSERT_THAT(stats.frames_composited(), Ge(test_frames));
+
+    auto average_latency = display.group.average_latency();
+    EXPECT_THAT(average_latency, Lt(0.5f));
+
+    if (server.get_options()->get<bool>(mtd::logging_opt))
+        display.group.dump_latency();
+}
+
 TEST_F(ClientLatency, throttled_input_rate_yields_lower_latency)
 {
     int const throttled_input_rate = refresh_rate * 3 / 4;