Merge lp:~alan-griffiths/mir/make-mir_demo_server-dlopen-mir into lp:mir

[Alan Griffiths]

examples: remove mir_demo_server_loader and make mir_demo_server dynamically load Mir

examples: remove mir_demo_server_loader and make mir_demo_server dynamically load Mir

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2826
http://jenkins.qa.ubuntu.com/job/mir-ci/4511/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3461
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/993
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3409/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/660
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/660/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3409
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3409/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6196/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22419

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

[1439208523.452807] <WARNING> mircommon: Failed to load module: /usr/lib/arm-linux-gnueabihf/mir/server-platform/server-mesa-x11.so.4 (error was:/usr/lib/arm-linux-gnueabihf/mir/server-platform/server-mesa-x11.so.4: undefined symbol: _ZN3mir6events10make_eventExNSt6chrono8durationIxSt5ratioILx1ELx1000000000EEEE17MirKeyboardActionjij)
[1439208523.453326] mirplatform: Found graphics driver: dummy
[1439208523.454822] mirplatform: Found graphics driver: android
[1439208523.455402] mirplatform: Found graphics driver: mesa-kms
[1439208523.455951] mirserver: Selected driver: android (version 0.16.0)
/bin/bash: line 1: 12958 Segmentation fault (core dumped) mir_demo_server --test-client /usr/bin/mir_demo_client_basic

Odd.

We're running on a mako and failing to load a mesa-x11 driver because mir::events::make_event(long long, std::chrono::duration<long long, std::ratio<1ll, 1000000000ll> >, MirKeyboardAction, unsigned int, int, unsigned int) isn't defined.

So, server-mesa-x11 links against mirprotobuf and that has a transitive link against mircommon, but neither links against mirclient where the above function resides.

[Cemil Azizoglu (cemil-azizoglu)]

> [1439208523.452807] <WARNING> mircommon: Failed to load module: /usr/lib/arm-
> linux-gnueabihf/mir/server-platform/server-mesa-x11.so.4 (error was:/usr/lib
> /arm-linux-gnueabihf/mir/server-platform/server-mesa-x11.so.4: undefined
> symbol: _ZN3mir6events10make_eventExNSt6chrono8durationIxSt5ratioILx1ELx100000
> 0000EEEE17MirKeyboardActionjij)
> [1439208523.453326] mirplatform: Found graphics driver: dummy
> [1439208523.454822] mirplatform: Found graphics driver: android
> [1439208523.455402] mirplatform: Found graphics driver: mesa-kms
> [1439208523.455951] mirserver: Selected driver: android (version 0.16.0)
> /bin/bash: line 1: 12958 Segmentation fault (core dumped) mir_demo_server
> --test-client /usr/bin/mir_demo_client_basic
>
> Odd.
>
> We're running on a mako and failing to load a mesa-x11 driver because
> mir::events::make_event(long long, std::chrono::duration<long long,
> std::ratio<1ll, 1000000000ll> >, MirKeyboardAction, unsigned int, int,
> unsigned int) isn't defined.
>
> So, server-mesa-x11 links against mirprotobuf and that has a transitive link
> against mircommon, but neither links against mirclient where the above
> function resides.

Besides mesa-x11, mirserver uses the event builders. It makes more sense to me if event builders were part of mircommon, rather than mirclient, as a long(-ish) term goal.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2827
http://jenkins.qa.ubuntu.com/job/mir-ci/4515/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3466
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/326/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/998
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3414/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/664
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/664/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3414
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3414/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6201/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22430

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

> So, server-mesa-x11 links against mirprotobuf and that has a transitive link
> against mircommon, but neither links against mirclient where the above
> function resides.

mirprotobuf does not link against mircommon.

http://pastebin.ubuntu.com/12051149/

[Alan Griffiths (alan-griffiths)]

On Monday, 10 August 2015 21:29:49 BST, Alberto Aguirre wrote:
>> So, server-mesa-x11 links against mirprotobuf and that has a
>> transitive link
>> against mircommon, but neither links against mirclient where the above
>> function resides.
>
> mirprotobuf does not link against mircommon.
>
> http://pastebin.ubuntu.com/12051149/

I meant mirplatform

--
Alan Griffiths. [phone]
Octopull Limited. http://www.octopull.co.uk/

[Alberto Aguirre (albaguirre)]

Umm the segmantation fault is actually a crash in the GL driver....

http://pastebin.ubuntu.com/12052505/

Seems related to TLS collisions between android GL driver and glibc as if I add a dummy thread local array (like in screencast.cpp) the issue goes away. This is becoming quite annoying... I wonder if we should request the android side of things to be built with the slower GL dispatch mode.

[Chris Halse Rogers (raof)]

Alternatively: could hybris actually claim the relevant TLS slots?

[Chris Halse Rogers (raof)]

Otherwise seems sensible.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2828
http://jenkins.qa.ubuntu.com/job/mir-ci/4527/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3481/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/341/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1013/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3429/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/676/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3429/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2829
http://jenkins.qa.ubuntu.com/job/mir-ci/4529/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3485
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/345/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1017
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3433/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/678
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/678/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3433
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3433/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6218/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22462

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2830
http://jenkins.qa.ubuntu.com/job/mir-ci/4530/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3487
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1019
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3435/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/679
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3435
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3435/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6220/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22466

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

^--That's for r2830

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2832
http://jenkins.qa.ubuntu.com/job/mir-ci/4532/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3490
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1022
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/681
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/681/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3438
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3438/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6223
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22471

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Daniel van Vugt (vanvugt)]

Doesn't make any sense to me but seems less crazy than the code it replaces. I'll top approve for everyone's votes anyway.

review: Abstain

[Alberto Aguirre (albaguirre)]

Maybe libhybris doesn't support loading libGLESv2 with RTLD_NOW.

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1771/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3504
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-wily-amd64-build/365/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/1037/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3452
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/324/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3452
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3452/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6237
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22502

review: Needs Fixing (continuous-integration)

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2015-07-29 17:23:39 +0000
+++ examples/CMakeLists.txt	2015-08-11 14:23:35 +0000
@@ -181,20 +181,6 @@
     ${Boost_LIBRARIES}
 )
 
-mir_add_wrapped_executable(mir_demo_server
-  server_example.cpp
-  glog_logger.cpp
-  server_example_test_client.cpp
-)
-
-target_link_libraries(mir_demo_server
-  mirserver
-  exampleserverconfig
-  ${GLog_LIBRARY}
-  ${GFlags_LIBRARY}
-  ${Boost_LIBRARIES}
-)
-
 add_library(mir_demo_server_loadable MODULE
   server_example.cpp
   glog_logger.cpp
@@ -213,11 +199,11 @@
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
-mir_add_wrapped_executable(mir_demo_server_loader
+mir_add_wrapped_executable(mir_demo_server
   mir_demo_server_loader.cpp
 )
 
-target_link_libraries(mir_demo_server_loader
+target_link_libraries(mir_demo_server
   dl
 )
 

=== modified file 'examples/mir_demo_server_loader.cpp'
--- examples/mir_demo_server_loader.cpp	2015-05-19 21:34:34 +0000
+++ examples/mir_demo_server_loader.cpp	2015-08-11 14:23:35 +0000
@@ -29,7 +29,7 @@
 int main(int argc, char const* argv[])
 try
 {
-    auto const so = dlopen(library, RTLD_NOW|RTLD_LOCAL);
+    auto const so = dlopen(library, RTLD_LAZY|RTLD_LOCAL);
     if (!so) throw std::runtime_error(dlerror());
 
     int (*loaded_main)(int, char const*[]){nullptr};