Mir

Merge lp://qastaging/~alan-griffiths/mir/Hack-around-the-way-unity8-loads-Mir-libraries into lp://qastaging/mir

  1. Hack-around-the-way-unity8-loads-Mir-libraries
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Cemil Azizoglu
Approved revision: no longer in the source branch.
Merged at revision: 1878
Proposed branch: lp://qastaging/~alan-griffiths/mir/Hack-around-the-way-unity8-loads-Mir-libraries
Merge into: lp://qastaging/mir
Diff against target: 82 lines (+33/-0)
2 files modified
src/client/default_connection_configuration.cpp (+16/-0)
src/platform/options/default_configuration.cpp (+17/-0)
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/Hack-around-the-way-unity8-loads-Mir-libraries
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alberto Aguirre (community) Approve
Andreas Pokorny (community) Approve
Alexandros Frantzis (community) Approve
Kevin DuBois (community) Approve
Review via email: mp+232699@code.qastaging.launchpad.net

Commit message

client, platform: ensure that plugins can resolve symbols in these libraries

Description of the change

client, platform: ensure that plugins can resolve symbols in these libraries

Unity8 loads Mir via dlopen(..., RTLD_LOCAL) which means that some common library entry points cannot be resolved by Mir platform plugins

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

looks okay to me, although we should put the problem described in the description of the MP in:
19 +// Hack around the way Qt loads mir
for future reference.

review: Approve
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks sensible as a workaround. I gather we can't easily change the Qt loading process to use RTLD_GLOBAL?

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> Looks sensible as a workaround. I gather we can't easily change the Qt loading
> process to use RTLD_GLOBAL?

We could, for example, do a similar hack in the qtmir plugin - but this way we make a minimum number of symbol global and support other frameworks that load Mir via a plugin.

Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

never heard of dladdr before - just reading the manual.. the workaround looks reasonable.
You could also add the bug number..

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> never heard of dladdr before - just reading the manual.. the workaround looks
> reasonable.
> You could also add the bug number..

Finding dladdr() was the hard part. ;)

I don't think Cemil logged a bug for what was a problem discovered on a release spike.

Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Clever :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1875
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2556/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1078
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1078/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/453
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/453/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2592
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12363

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2556/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1876
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2558/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1080
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1080/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/456
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2597
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12375

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2558/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches