Merge lp:~alan-griffiths/mir/remove-RTLD_GLOBAL-hack into lp:mir

[Alan Griffiths]

mesa-kms: remove RTLD_GLOBAL hack from server platform

mesa-kms: remove RTLD_GLOBAL hack from server platform

The hack is also applied by the client mesa platform. So this is redundant.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3099
http://jenkins.qa.ubuntu.com/job/mir-ci/5540/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4796
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/754/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1694
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1694/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/754
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/754/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4797
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7394
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25102
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/755/console

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Andreas Pokorny (andreas-pokorny)]

agreed

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3763
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4798/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/756/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/668/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/756
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/756/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4799
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4799/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7396/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25109
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/757/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/platforms/mesa/server/kms/platform_symbols.cpp'
--- src/platforms/mesa/server/kms/platform_symbols.cpp	2015-11-09 15:58:52 +0000
+++ src/platforms/mesa/server/kms/platform_symbols.cpp	2015-11-11 17:49:42 +0000
@@ -26,7 +26,6 @@
 
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include <dlfcn.h>
 
 namespace mg = mir::graphics;
 namespace mgm = mg::mesa;
@@ -97,17 +96,6 @@
         return ::setsid();
     }
 };
-
-// Hack around the way mesa loads mir: This hack makes the
-// necessary symbols global.
-void ensure_loaded_with_rtld_global()
-{
-    Dl_info info;
-
-    dladdr(reinterpret_cast<void*>(&ensure_loaded_with_rtld_global), &info);
-    dlopen(info.dli_fname,  RTLD_NOW | RTLD_NOLOAD | RTLD_GLOBAL);
-}
-
 }
 
 mir::UniqueModulePtr<mg::Platform> create_host_platform(
@@ -210,7 +198,5 @@
     std::shared_ptr<mg::DisplayReport> const&,
     std::shared_ptr<mg::NestedContext> const& nested_context)
 {
-    // ensure mesa finds the mesa mir-platform symbols
-    ensure_loaded_with_rtld_global();
     return mir::make_module_ptr<mgm::GuestPlatform>(nested_context);
 }