Mir

Merge lp://qastaging/~vanvugt/mir/fix-1617865-without-breaks into lp://qastaging/mir

  1. fix-1617865-without-breaks
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 3716
Proposed branch: lp://qastaging/~vanvugt/mir/fix-1617865-without-breaks
Merge into: lp://qastaging/mir
Diff against target: 71 lines (+44/-0)
3 files modified
src/common/dispatch/CMakeLists.txt (+1/-0)
src/common/dispatch/legacy_readable_fd.cpp (+34/-0)
src/common/symbols.map (+9/-0)
To merge this branch: bzr merge lp://qastaging/~vanvugt/mir/fix-1617865-without-breaks
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Kevin DuBois (community) Approve
Alan Griffiths Approve
Review via email: mp+306745@code.qastaging.launchpad.net

Commit message

Fix ABI break LP: #1617865 without introducing another break by
re-exporting the old deleted symbol versions. The new versions
continue to also be exported by the usual symbols.map.

Description of the change

Mir 0.23.5:
MIR_COMMON_5.1  _ZN3mir8dispatch10ReadableFd8dispatchEj
MIR_COMMON_5.1  _ZN3mir8dispatch10ReadableFdC1ENS_2FdERKSt8functionIFvvEE
MIR_COMMON_5.1  _ZN3mir8dispatch10ReadableFdC2ENS_2FdERKSt8functionIFvvEE
MIR_COMMON_5.1  _ZN3mir8dispatch10ReadableFdD0Ev
MIR_COMMON_5.1  _ZN3mir8dispatch10ReadableFdD1Ev
MIR_COMMON_5.1  _ZN3mir8dispatch10ReadableFdD2Ev
MIR_COMMON_5.1  _ZNK3mir8dispatch10ReadableFd15relevant_eventsEv
MIR_COMMON_5.1  _ZNK3mir8dispatch10ReadableFd8watch_fdEv

Mir 0.24.0:
MIR_COMMON_0.24 _ZN3mir8dispatch10ReadableFd8dispatchEj
MIR_COMMON_0.24 _ZN3mir8dispatch10ReadableFdC1ENS_2FdERKSt8functionIFvvEE
MIR_COMMON_0.24 _ZN3mir8dispatch10ReadableFdC2ENS_2FdERKSt8functionIFvvEE
MIR_COMMON_0.24 _ZN3mir8dispatch10ReadableFdD0Ev
MIR_COMMON_0.24 _ZN3mir8dispatch10ReadableFdD1Ev
MIR_COMMON_0.24 _ZN3mir8dispatch10ReadableFdD2Ev
MIR_COMMON_0.24 _ZNK3mir8dispatch10ReadableFd15relevant_eventsEv
MIR_COMMON_0.24 _ZNK3mir8dispatch10ReadableFd8watch_fdEv
MIR_COMMON_0.24 _ZTVN3mir8dispatch10ReadableFdE

Mir 0.25.0:
MIR_COMMON_0.24  _ZN3mir8dispatch10ReadableFd8dispatchEj
(MIR_COMMON_5.1) _ZN3mir8dispatch10ReadableFd8dispatchEj
MIR_COMMON_0.24  _ZN3mir8dispatch10ReadableFdC1ENS_2FdERKSt8functionIFvvEE
(MIR_COMMON_5.1) _ZN3mir8dispatch10ReadableFdC1ENS_2FdERKSt8functionIFvvEE
MIR_COMMON_0.24  _ZN3mir8dispatch10ReadableFdC2ENS_2FdERKSt8functionIFvvEE
(MIR_COMMON_5.1) _ZN3mir8dispatch10ReadableFdC2ENS_2FdERKSt8functionIFvvEE
MIR_COMMON_0.24  _ZN3mir8dispatch10ReadableFdD0Ev
(MIR_COMMON_5.1) _ZN3mir8dispatch10ReadableFdD0Ev
MIR_COMMON_0.24  _ZN3mir8dispatch10ReadableFdD1Ev
(MIR_COMMON_5.1) _ZN3mir8dispatch10ReadableFdD1Ev
MIR_COMMON_0.24  _ZN3mir8dispatch10ReadableFdD2Ev
(MIR_COMMON_5.1) _ZN3mir8dispatch10ReadableFdD2Ev
MIR_COMMON_0.24  _ZNK3mir8dispatch10ReadableFd15relevant_eventsEv
(MIR_COMMON_5.1) _ZNK3mir8dispatch10ReadableFd15relevant_eventsEv
MIR_COMMON_0.24  _ZNK3mir8dispatch10ReadableFd8watch_fdEv
(MIR_COMMON_5.1) _ZNK3mir8dispatch10ReadableFd8watch_fdEv
MIR_COMMON_0.24  _ZTVN3mir8dispatch10ReadableFdE

To post a comment you must log in.
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I have also verified this branch fixes the driver load failure that originally exposed the bug:
https://bugs.launchpad.net/mir/+bug/1611804/comments/8

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3716
https://mir-jenkins.ubuntu.com/job/mir-ci/1814/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2266
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2329
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2320
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2320
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2320
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2294
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2294/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2294
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2294/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2294
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2294/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/2294
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2294/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2294
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2294/artifact/output/*zip*/output.zip

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

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

The purist in me wants MIR_COMMON_5.1 to be the default symbol, but this is the best solution so far and definitely adequate.

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm too

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/607/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2272/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/647/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2335
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2326
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2326
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2326
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2300/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2300
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2300/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2300
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2300/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/2300
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2300/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2300
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2300/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

^^^
Just autolanding bug 1616312 again

Revision history for this message
Mir CI Bot (mir-ci-bot) :
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