Merge lp:~raof/mir/fix-ftbfs-against-mesa-11 into lp:mir

[Chris Halse Rogers]

Re-add android/native_window.h and its dependency to 3rd_party.

Khronos' eglplatform.h headers have long #include<>d native_window.h. Now that Mesa has refreshed their header (from 2009) to something more modern this means that we need to provide android/native_window.h.

Fixes the build against Mesa 11.0, now in Wily.

Fixes: https://bugs.launchpad.net/mir/+bug/1499134

Re-add android/native_window.h and its dependency to 3rd_party.

Khronos' eglplatform.h headers have long #include<>d native_window.h. Now that Mesa has refreshed their header (from 2009) to something more modern this means that we need to provide android/native_window.h.

Fixes the build against Mesa 11.0, now in Wily.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2962
http://jenkins.qa.ubuntu.com/job/mir-ci/5007/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3020
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4055/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1158
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1158/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4056
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4056/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6747/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23631
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/14/console

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Cool.

native_window.h was only recently removed in r2845 (for release in 0.16.0). However a similar fix (just the "include_directories") is still required in older branches like lp:mir/0.15 in order to find the in-tree native_window.h

review: Approve

[Alan Griffiths (alan-griffiths)]

phablet-test-run -x -s 00693fd555c9186a -v umockdev-run -- mir_performance_tests
running umockdev-run -- mir_performance_tests
initctl: unable to determine sessions
initctl: unable to determine sessions
Running main() from main.cpp
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from GLMark2Test
[ RUN ] GLMark2Test.benchmark_fullscreen_default
[1443076724.736955] mirplatform: Found graphics driver: android
[1443076724.737657] mirplatform: Found graphics driver: mesa-kms
[1443076724.738695] mirplatform: Found graphics driver: mesa-x11
[1443076724.739274] mirplatform: Found graphics driver: dummy
ERROR: Throw location unknown (consider using BOOST_THROW_EXCEPTION)
Dynamic exception type: N5boost16exception_detail10clone_implINS0_19error_info_injectorINS_6system12system_errorEEEEE
std::exception::what: bind: No such file or directory

unknown file: Failure
C++ exception with description "Failed to start server thread" thrown in SetUp().
[ FAILED ] GLMark2Test.benchmark_fullscreen_default (10062 ms)
[----------] 1 test from GLMark2Test (10062 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (10064 ms total)
[ PASSED ] 0 tests.
[ FAILED ] 1 test, listed below:
[ FAILED ] GLMark2Test.benchmark_fullscreen_default

@ "(consider using BOOST_THROW_EXCEPTION)" Weird. Looks like the exception was wrapped by boost, but not identified as such. (RTTI information from different libs not matching?)

Does glmark need an update to match mesa?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2962
http://jenkins.qa.ubuntu.com/job/mir-ci/5009/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3022
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4057/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/15/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1160
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1160/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/15/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4058
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4058/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6749/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23633
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/16/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

[ RUN ] ThreadedDispatcherSignalTest.keeps_dispatching_after_signal_interruption
==3180==
==3180== FILE DESCRIPTORS: 3 open at exit.
==3180== Open file descriptor 4: /tmp/buildd/mir-0.16.0bzr2962pkg0wily13/obj-i686-linux-gnu/Testing/Temporary/LastTest.log.tmp
==3180== <inherited from parent>
==3180==
==3180== Open file descriptor 2:
==3180== <inherited from parent>
==3180==
==3180== Open file descriptor 1:
==3180== <inherited from parent>
==3180==
==3180==
==3180== HEAP SUMMARY:
==3180== in use at exit: 107,163 bytes in 830 blocks
==3180== total heap usage: 828,191 allocs, 827,361 frees, 98,223,627 bytes allocated
==3180==
==3180== LEAK SUMMARY:
==3180== definitely lost: 0 bytes in 0 blocks
==3180== indirectly lost: 0 bytes in 0 blocks
==3180== possibly lost: 3,544 bytes in 114 blocks
==3180== still reachable: 103,167 bytes in 710 blocks
==3180== suppressed: 0 bytes in 0 blocks
==3180== Reachable blocks (those to which a pointer was found) are not shown.
==3180== To see them, rerun with: --leak-check=full --show-leak-kinds=all
==3180==
==3180== For counts of detected and suppressed errors, rerun with: -v
==3180== Use --track-origins=yes to see where uninitialised values come from
==3180== ERROR SUMMARY: 17534 errors from 16 contexts (suppressed: 1 from 1)
/tmp/buildd/mir-0.16.0bzr2962pkg0wily13/tests/unit-tests/dispatch/test_threaded_dispatcher.cpp:368: Failure
Value of: result.succeeded()
Actual: false
Expected: true
[ FAILED ] ThreadedDispatcherSignalTest.keeps_dispatching_after_signal_interruption (1014 ms)
[----------] 1 test from ThreadedDispatcherSignalTest (1017 ms total)

The same failure in:

https://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/13/console
https://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/14/console
https://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/15/console
https://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/16/console

Something has changed. Logged as lp:1499229

[Alan Griffiths (alan-griffiths)]

The important fail (mir-wily-i386-ci and mir-mediumtests-builder-wily-armhf are marked non-fatal) is:

https://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6749/consoleFull

...
> creating: package_archive/archive/work/output/
> inflating: package_archive/archive/work/output/libmircookie-dev_0.16.0bzr2962pkg0wily4058+autopilot0_armhf.deb
> inflating: package_archive/archive/work/output/mir-client-platform-mesa-dev_0.16.0bzr2962pkg0wily4058+autopilot0_armhf.deb

So these are *wily* debs? On a vivid+overlay image?

...
> running mir_demo_server --test-client /usr/bin/mir_demo_client_basic
> initctl: unable to determine sessions
> initctl: unable to determine sessions
> [1443083181.507545] mirplatform: Found graphics driver: android
> [1443083181.508430] mirplatform: Found graphics driver: mesa-kms
> [1443083181.508582] mirplatform: Found graphics driver: mesa-x11
> [1443083181.509131] mirplatform: Found graphics driver: dummy
> [1443083181.513890] mirserver: Starting
> [1443083181.514775] mircommon: Loading modules from: /usr/lib/arm-linux-gnueabihf/mir/server-platform
> [1443083181.515171] mircommon: Loading module: /usr/lib/arm-linux-gnueabihf/mir/server-platform/graphics-android.so.5
> [1443083181.515294] mircommon: Loading module: /usr/lib/arm-linux-gnueabihf/mir/server-platform/graphics-mesa-kms.so.5
> [1443083181.515385] mircommon: Loading module: /usr/lib/arm-linux-gnueabihf/mir/server-platform/server-mesa-x11.so.5
> [1443083181.519473] mircommon: Loading module: /usr/lib/arm-linux-gnueabihf/mir/server-platform/input-evdev.so.2
> [1443083181.522828] mircommon: Loading module: /usr/lib/arm-linux-gnueabihf/mir/server-platform/graphics-dummy.so
> [1443083181.524689] mircommon: Loading module: /usr/lib/arm-linux-gnueabihf/mir/server-platform/input-stub.so
> [1443083181.527313] mirplatform: Found graphics driver: android
> [1443083181.527801] mirplatform: Found graphics driver: mesa-kms
> [1443083181.527953] mirplatform: Found graphics driver: mesa-x11
> [1443083181.528228] mirplatform: Found graphics driver: dummy
> [1443083181.529234] mirserver: Selected driver: android (version 0.16.0)
> [1443083182.041171] mirserver: Initial display configuration:
> [1443083182.045442] mirserver: 0.0: LVDS 4.7" 61x102mm
> [1443083182.045686] mirserver: Current mode 768x1280 60.00Hz
> [1443083182.045778] mirserver: Preferred mode 768x1280 60.00Hz
> [1443083182.045839] mirserver: Logical position +0+0
> [1443083182.045930] mirserver: 0.1: unused DisplayPort
> ERROR: Throw location unknown (consider using BOOST_THROW_EXCEPTION)
> Dynamic exception type: N5boost16exception_detail10clone_implINS0_19error_info_injectorINS_6system12system_errorEEEEE
> std::exception::what: bind: No such file or directory

*Looks* like all clients are dying for lack of an endpoint.

[Alan Griffiths (alan-griffiths)]

Trying to reproduce (on krillin) I see another error entirely:

Running main() from main.cpp
[==========] Running 1 test from 1 test case.
[----------] Global test environment set-up.
[----------] 1 test from GLMark2Test
[ RUN ] GLMark2Test.benchmark_fullscreen_default
[1443100994.386983] mirplatform: Found graphics driver: android
[1443100994.391768] mirplatform: Found graphics driver: mesa-kms
[1443100994.393662] mirplatform: Found graphics driver: mesa-x11
[1443100994.394339] mirplatform: Found graphics driver: dummy
Error: Requested MapBuffer VBO update method but GL_OES_mapbuffer is not supported!
Error: Requested MapBuffer VBO update method but GL_OES_mapbuffer is not supported!
Error: SceneTerrain requires Vertex Texture Fetch support, but GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS is 0
[ OK ] GLMark2Test.benchmark_fullscreen_default (311016 ms)
[----------] 1 test from GLMark2Test (311018 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test case ran. (311024 ms total)
[ PASSED ] 1 test.
Segmentation fault (core dumped)

[Alberto Aguirre (albaguirre)]

I thought native_window.h was included in the android-headers package, but it is not.

Maybe we should ask for it to be included there?

=== added file '3rd_party/android-deps/android/native_window.h'
--- 3rd_party/android-deps/android/native_window.h	1970-01-01 00:00:00 +0000
+++ 3rd_party/android-deps/android/native_window.h	2015-09-24 04:45:04 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_NATIVE_WINDOW_H
+#define ANDROID_NATIVE_WINDOW_H
+
+#include <android/rect.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Pixel formats that a window can use.
+ */
+enum {
+    WINDOW_FORMAT_RGBA_8888          = 1,
+    WINDOW_FORMAT_RGBX_8888          = 2,
+    WINDOW_FORMAT_RGB_565            = 4,
+};
+
+struct ANativeWindow;
+typedef struct ANativeWindow ANativeWindow;
+
+typedef struct ANativeWindow_Buffer {
+    // The number of pixels that are show horizontally.
+    int32_t width;
+
+    // The number of pixels that are shown vertically.
+    int32_t height;
+
+    // The number of *pixels* that a line in the buffer takes in
+    // memory.  This may be >= width.
+    int32_t stride;
+
+    // The format of the buffer.  One of WINDOW_FORMAT_*
+    int32_t format;
+
+    // The actual bits.
+    void* bits;
+    
+    // Do not touch.
+    uint32_t reserved[6];
+} ANativeWindow_Buffer;
+
+/**
+ * Acquire a reference on the given ANativeWindow object.  This prevents the object
+ * from being deleted until the reference is removed.
+ */
+void ANativeWindow_acquire(ANativeWindow* window);
+
+/**
+ * Remove a reference that was previously acquired with ANativeWindow_acquire().
+ */
+void ANativeWindow_release(ANativeWindow* window);
+
+/*
+ * Return the current width in pixels of the window surface.  Returns a
+ * negative value on error.
+ */
+int32_t ANativeWindow_getWidth(ANativeWindow* window);
+
+/*
+ * Return the current height in pixels of the window surface.  Returns a
+ * negative value on error.
+ */
+int32_t ANativeWindow_getHeight(ANativeWindow* window);
+
+/*
+ * Return the current pixel format of the window surface.  Returns a
+ * negative value on error.
+ */
+int32_t ANativeWindow_getFormat(ANativeWindow* window);
+
+/*
+ * Change the format and size of the window buffers.
+ *
+ * The width and height control the number of pixels in the buffers, not the
+ * dimensions of the window on screen.  If these are different than the
+ * window's physical size, then it buffer will be scaled to match that size
+ * when compositing it to the screen.
+ *
+ * For all of these parameters, if 0 is supplied then the window's base
+ * value will come back in force.
+ *
+ * width and height must be either both zero or both non-zero.
+ *
+ */
+int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window,
+        int32_t width, int32_t height, int32_t format);
+
+/**
+ * Lock the window's next drawing surface for writing.
+ * inOutDirtyBounds is used as an in/out parameter, upon entering the
+ * function, it contains the dirty region, that is, the region the caller
+ * intends to redraw. When the function returns, inOutDirtyBounds is updated
+ * with the actual area the caller needs to redraw -- this region is often
+ * extended by ANativeWindow_lock.
+ */
+int32_t ANativeWindow_lock(ANativeWindow* window, ANativeWindow_Buffer* outBuffer,
+        ARect* inOutDirtyBounds);
+
+/**
+ * Unlock the window's drawing surface after previously locking it,
+ * posting the new buffer to the display.
+ */
+int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // ANDROID_NATIVE_WINDOW_H

=== added file '3rd_party/android-deps/android/rect.h'
--- 3rd_party/android-deps/android/rect.h	1970-01-01 00:00:00 +0000
+++ 3rd_party/android-deps/android/rect.h	2015-09-24 04:45:04 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef ANDROID_RECT_H
+#define ANDROID_RECT_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct ARect {
+#ifdef __cplusplus
+    typedef int32_t value_type;
+#endif
+    int32_t left;
+    int32_t top;
+    int32_t right;
+    int32_t bottom;
+} ARect;
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // ANDROID_RECT_H

=== modified file 'src/common/graphics/android/CMakeLists.txt'
--- src/common/graphics/android/CMakeLists.txt	2015-06-17 05:20:42 +0000
+++ src/common/graphics/android/CMakeLists.txt	2015-09-24 04:45:04 +0000
@@ -1,4 +1,5 @@
 include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
 
 add_definitions( -DANDROID )
 

=== modified file 'src/platforms/android/client/CMakeLists.txt'
--- src/platforms/android/client/CMakeLists.txt	2015-07-21 04:30:03 +0000
+++ src/platforms/android/client/CMakeLists.txt	2015-09-24 04:45:04 +0000
@@ -1,5 +1,7 @@
 include_directories(${client_common_include_dirs})
 include_directories(SYSTEM ${LIBHARDWARE_INCLUDE_DIRS})
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
+
 add_definitions(-DANDROID)
 
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)

=== modified file 'src/platforms/android/server/CMakeLists.txt'
--- src/platforms/android/server/CMakeLists.txt	2015-07-21 04:30:03 +0000
+++ src/platforms/android/server/CMakeLists.txt	2015-09-24 04:45:04 +0000
@@ -8,6 +8,7 @@
     ${GLESv2_INCLUDE_DIRS}
     ${ANDROID_PROPERTIES_INCLUDE_DIRS}
 )
+include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/3rd_party/android-deps)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 add_definitions( -DANDROID )