Mir

Merge lp://staging/~alan-griffiths/mir/add-DisplayConfigurationObserver-base_configuration_updated into lp://staging/mir

  1. add-DisplayConfigurationObserver-base_configuration_updated
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 3848
Proposed branch: lp://staging/~alan-griffiths/mir/add-DisplayConfigurationObserver-base_configuration_updated
Merge into: lp://staging/mir
Diff against target: 192 lines (+59/-4)
8 files modified
include/server/mir/graphics/display_configuration_observer.h (+7/-0)
src/server/graphics/display_configuration_observer_multiplexer.cpp (+6/-0)
src/server/graphics/display_configuration_observer_multiplexer.h (+2/-0)
src/server/report/logging/display_configuration_report.cpp (+11/-4)
src/server/report/logging/display_configuration_report.h (+2/-0)
src/server/scene/mediating_display_changer.cpp (+2/-0)
tests/acceptance-tests/test_nested_mir.cpp (+1/-0)
tests/unit-tests/scene/test_mediating_display_changer.cpp (+28/-0)
To merge this branch: bzr merge lp://staging/~alan-griffiths/mir/add-DisplayConfigurationObserver-base_configuration_updated
Reviewer Review Type Date Requested Status
Andreas Pokorny (community) Approve
Kevin DuBois (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+311811@code.staging.launchpad.net

Commit message

Add a base_configuration_updated() notification to DisplayConfigurationObserver

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3847
https://mir-jenkins.ubuntu.com/job/mir-ci/2274/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2946
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3011
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3003
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3003
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3003
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2975
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2975/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/2975
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2975/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2975
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2975/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2975
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2975/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/2975
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2975/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/2975
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2975/artifact/output/*zip*/output.zip

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

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

okay by me, is handing out the std::shared_ptr<DisplayConfiguration> useful (as opposed to DisplayConfiguration const&)

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

> okay by me, is handing out the std::shared_ptr<DisplayConfiguration> useful
> (as opposed to DisplayConfiguration const&)

In short: yes.

While you and I were no looking someone decided to action the notifications on another second thread. Because of that the lifetime of the config needs to be extended until that notification runs.

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

sure

review: Approve

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