Merge lp:~vanvugt/mir/testfix-1665802 into lp:mir

[Daniel van Vugt]

Proof of concept test-fix for LP: #1665802

DO NOT APPROVE

Alberto please try this on the dragonboard. It's not a fix I like but if
it works then that's at least useful information.

[Daniel van Vugt (vanvugt)]

review: Disapprove

[lp:~vanvugt/mir/testfix-1665802]

4052. By Daniel van Vugt on 2017-02-23

Tidy up and strengthen the test

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

FAILED: Continuous integration, rev:4051
https://mir-jenkins.ubuntu.com/job/mir-ci/3045/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4069/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4156
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4146
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4146
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4146
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4096/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/4096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4096/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4096/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4096/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4096/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/4096
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4096/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4096/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Bug 1646558 and also:

11:02:37 I: The following clients failed to execute successfully:
11:02:37 I: mir_demo_client_camera
11:02:37 I: Smoke testing complete with returncode -1

[lp:~vanvugt/mir/testfix-1665802]

4053. By Daniel van Vugt on 2017-02-23

Try again

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

PASSED: Continuous integration, rev:4052
https://mir-jenkins.ubuntu.com/job/mir-ci/3046/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4071
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4158
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4148
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4148
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4148
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4098
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4098/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/4098
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4098/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4098
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4098/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/4098
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4098/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/4098
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4098/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/4098
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4098/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:4053
https://mir-jenkins.ubuntu.com/job/mir-ci/3047/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4072
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4159
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4149
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4149
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4149
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4099
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4099/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/4099
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4099/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4099
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4099/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/4099
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4099/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/4099
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4099/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/4099
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4099/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~vanvugt/mir/testfix-1665802]

4054. By Daniel van Vugt on 2017-02-24

Merge latest trunk

4055. By Daniel van Vugt on 2017-02-24

A better test

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

FAILED: Continuous integration, rev:4055
https://mir-jenkins.ubuntu.com/job/mir-ci/3056/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4086/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4173
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4163
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4163
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4163
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4113/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/4113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4113/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4113/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4113/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/4113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4113/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/4113
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4113/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~vanvugt/mir/testfix-1665802]

4056. By Daniel van Vugt on 2017-02-27

Merge latest trunk

4057. By Daniel van Vugt on 2017-02-27

Much better regression test

4058. By Daniel van Vugt on 2017-02-27

Much better test

Unmerged revisions

4058. By Daniel van Vugt on 2017-02-27

Much better test

4057. By Daniel van Vugt on 2017-02-27

Much better regression test

4056. By Daniel van Vugt on 2017-02-27

Merge latest trunk

4055. By Daniel van Vugt on 2017-02-24

A better test

4054. By Daniel van Vugt on 2017-02-24

Merge latest trunk

4053. By Daniel van Vugt on 2017-02-23

Try again

4052. By Daniel van Vugt on 2017-02-23

Tidy up and strengthen the test

4051. By Daniel van Vugt on 2017-02-23

First hack of a regression test and an ugly fix

=== modified file 'src/client/frame_clock.cpp'
--- src/client/frame_clock.cpp	2016-11-29 08:00:45 +0000
+++ src/client/frame_clock.cpp	2017-02-27 08:17:57 +0000
@@ -103,7 +103,7 @@
      * Crucially this is not required on most frames, so that even if it is
      * implemented as a round trip to the server, that won't happen often.
      */
-    if (missed_frames > 1 || config_changed)
+    if (missed_frames > 1 || config_changed || demerits > 0)
     {
         lock.unlock();
         auto const server_frame = resync_callback();
@@ -151,6 +151,12 @@
         // FIXME? Missing += operator
         target = target + missed_frames * period;
     }
+    else
+    {
+        demerits = 0;
+    }
+
+    demerits += missed_frames;
 
     return target;
 }

=== modified file 'src/client/frame_clock.h'
--- src/client/frame_clock.h	2016-12-15 08:15:54 +0000
+++ src/client/frame_clock.h	2017-02-27 08:17:57 +0000
@@ -66,6 +66,7 @@
     mutable bool config_changed;
     std::chrono::nanoseconds period;
     ResyncCallback resync_callback;
+    mutable long demerits = 0;
 };
 
 }} // namespace mir::client

=== modified file 'tests/unit-tests/client/test_frame_clock.cpp'
--- tests/unit-tests/client/test_frame_clock.cpp	2016-11-29 08:17:27 +0000
+++ tests/unit-tests/client/test_frame_clock.cpp	2017-02-27 08:17:57 +0000
@@ -395,6 +395,94 @@
     EXPECT_EQ(one_frame, e - d);        // No frame skipped. We have recovered.
 }
 
+TEST_F(FrameClockTest, repeatedly_missing_frame_deadline_targets_the_future)
+{   // Regression test for LP: #1665802
+    FrameClock clock(with_fake_time);
+    clock.set_period(one_frame);
+
+    PosixTimestamp a;
+    auto b = clock.next_frame_after(a);
+
+    fake_sleep_until(b);
+    fake_sleep_for(one_frame * 3 / 2);  // Render time: 1.5 frames
+
+    auto c = clock.next_frame_after(b);
+    ASSERT_EQ(one_frame, c - b);        // No frame skipped
+
+    fake_sleep_until(c);
+    fake_sleep_for(one_frame * 8 / 5);  // Render time: 1.6 frames
+
+    auto d = clock.next_frame_after(c);
+    ASSERT_EQ(2*one_frame, d - c);      // One frame skipped
+
+    /*
+     * Ensure that a client repeatedly missing the frame deadline does not
+     * repeatedly try to catch up, which may saturate the GPU (as found
+     * on Adreno) when using a sub-par driver (like Freedreno/Gallium drivers),
+     * starving the server of GPU time. (LP: #1665802)
+     */
+    for (int slow_frame = 0; slow_frame < 100; ++slow_frame)
+    {
+        fake_sleep_for(one_frame * 8 / 5);  // Render time: 1.6 frames
+        c = d;
+        d = clock.next_frame_after(d);
+        auto& now = fake_time[d.clock_id];
+        ASSERT_GT(d, now) << "slow frame #" << slow_frame;
+        ASSERT_EQ(2*one_frame, d - c) << "slow frame #" << slow_frame;
+        fake_sleep_until(d);
+    }
+
+    auto e = d;
+
+    /*
+     * If the client speeds up, we should quickly allow it to regain full
+     * frame rate:
+     */
+    for (int fast_frame = 0; fast_frame < 100; ++fast_frame)
+    {
+        fake_sleep_for(one_frame/4);  // Short render time, immediate recovery
+        e = clock.next_frame_after(d);
+        ASSERT_EQ(one_frame, e - d) << "fast frame #" << fast_frame;
+        fake_sleep_until(e);
+        d = e;
+    }
+
+    auto f = e;
+
+    /*
+     * In the original bug report the Adreno could only sustain 15 FPS without
+     * saturating the GPU. When it was trying to catch up and maintain
+     * 20-30 FPS, that was enough to saturate the GPU and the server couldn't
+     * display anything...
+     */
+    for (int really_slow_frame = 0; really_slow_frame < 100; ++really_slow_frame)
+    {
+        fake_sleep_for(one_frame * 17 / 5);  // Render time: 3.4 frames
+        f = clock.next_frame_after(e);
+        auto& now = fake_time[f.clock_id];
+        ASSERT_GT(f, now) << "really slow frame #" << really_slow_frame;
+        ASSERT_EQ(4*one_frame, f - e) << "really slow frame #" << really_slow_frame;
+        fake_sleep_until(f);
+        e = f;
+    }
+
+    auto g = f;
+
+    /*
+     * If the client speeds up, we should quickly allow it to regain full
+     * frame rate:
+     */
+    for (int fast_frame = 0; fast_frame < 100; ++fast_frame)
+    {
+        fake_sleep_for(one_frame/4);  // Short render time, immediate recovery
+        g = clock.next_frame_after(f);
+        ASSERT_EQ(one_frame, g - f) << "fast frame #" << fast_frame;
+        fake_sleep_until(g);
+        f = g;
+    }
+
+}
+
 TEST_F(FrameClockTest, nesting_adds_zero_lag)
 {
     FrameClock inner(with_fake_time);