Merge lp:~kdub/mir/fix-1554635 into lp:mir

[Kevin DuBois]

android: Just log the error when an eglSyncFence installation failure occurs. Apparently this happens on turbo during certain scenarios.

A bit of further digging might yield another solution, but this at least averts u8 from crashing, and is a transient problem on that device.

fixes: LP: #1554635

android: Just log the error when an eglSyncFence installation failure occurs. Apparently this happens on turbo during certain scenarios.

A bit of further digging might yield another solution, but this at least averts u8 from crashing, and is a transient problem on that device.

fixes: LP: #1554635

[Alberto Aguirre (albaguirre)]

Ok as a workaround.

review: Approve

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'src/platforms/android/common/egl_sync_fence.cpp'
--- src/platforms/android/common/egl_sync_fence.cpp	2016-03-16 06:59:01 +0000
+++ src/platforms/android/common/egl_sync_fence.cpp	2016-03-17 19:44:40 +0000
@@ -18,6 +18,9 @@
 
 #include "egl_sync_fence.h"
 #include <boost/throw_exception.hpp>
+#define MIR_LOG_COMPONENT "egl sync fence"
+#include "mir/log.h"
+#include <sstream>
 
 namespace mg = mir::graphics;
 
@@ -52,9 +55,18 @@
     wait_for(lk, default_timeout);
 
     fence_display = eglGetCurrentDisplay();
+    if (fence_display == EGL_NO_DISPLAY)
+    {
+        log_error("no current display");
+    }
+
     sync_point = egl->eglCreateSyncKHR(fence_display, EGL_SYNC_FENCE_KHR, NULL);
     if (sync_point == EGL_NO_SYNC_KHR)
-        BOOST_THROW_EXCEPTION(std::runtime_error("failed to add sync point to command buffer"));
+    {
+        std::stringstream str;
+        str << "failed to add sync point to command buffer: 0x" << std::hex << eglGetError(); 
+        log_error(str.str());
+    }
 }
 
 void mg::EGLSyncFence::reset()

=== modified file 'tests/unit-tests/graphics/android/test_egl_sync_fence.cpp'
--- tests/unit-tests/graphics/android/test_egl_sync_fence.cpp	2016-03-16 06:59:01 +0000
+++ tests/unit-tests/graphics/android/test_egl_sync_fence.cpp	2016-03-17 19:44:40 +0000
@@ -42,9 +42,9 @@
         .WillOnce(Return(EGL_NO_SYNC_KHR));
 
     mg::EGLSyncFence fence(sync_extensions);
-    EXPECT_THROW({
+    EXPECT_NO_THROW({
         fence.raise();
-    }, std::runtime_error); 
+    });
 }
 
 TEST_F(EglSyncFence, raise_sets_sync_point)