Merge lp:~vanvugt/mir/workaround-1391261 into lp:mir

[Daniel van Vugt]

Work around unstable Android overlay logic that will freeze if fed buffers
too quickly i.e. framedropping like in glmark2 (LP: #1391261).

Frame dropping is fortunately not something we use on the phone right now,
so not an issue we need to block on. This workaround is more important so
that the issue doesn't continue to block CI.

[Alan Griffiths (alan-griffiths)]

I'd rather fix the underlying problem but...

review: Approve

[Alexandros Frantzis (afrantzis)]

OK to unblock CI.

review: Approve

[Kevin DuBois (kdub)]

Do we need to ifdef on android? (mesa would ignore the option)
And yes, okay to unblock CI. lets not mark the bug fixed... I will pick up addressing the underlying cause.

[Kevin DuBois (kdub)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2111
http://jenkins.qa.ubuntu.com/job/mir-ci/2290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/386
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/360/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/281
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/360
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/360/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3600/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16336

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/performance-tests/test_glmark2-es2-mir.cpp'
--- tests/performance-tests/test_glmark2-es2-mir.cpp	2014-11-24 02:16:00 +0000
+++ tests/performance-tests/test_glmark2-es2-mir.cpp	2014-12-01 02:07:56 +0000
@@ -26,7 +26,19 @@
     {
     }
 
-    mir::DefaultServerConfiguration& server_config() override {return config;};
+    mir::DefaultServerConfiguration& server_config() override
+    {
+#ifdef ANDROID
+        /*
+         * Workaround instability that causes freezes when combining
+         * Android overlays with high-speed frame dropping (LP: #1391261).
+         * Fortunately glmark2 is the only use case that exploits this issue
+         * right now.
+         */
+        setenv("MIR_SERVER_DISABLE_OVERLAYS", "true", 1);
+#endif
+        return config;
+    };
 
 protected:
     enum ResultFileType {raw, json};