Merge into development-branch : client-api-apply-remove-display-config : Code : Mir

Status:	Merged
Approved by:	Brandon Schaefer on 2016-12-23
Approved revision:	no longer in the source branch.
Merged at revision:	3900
Proposed branch:	lp:~brandontschaefer/mir/client-api-apply-remove-display-config
Merge into:	lp:mir
Diff against target:	1018 lines (+556/-25) 29 files modified include/client/mir_toolkit/mir_connection.h (+24/-0) include/server/mir/graphics/display_configuration_observer.h (+19/-0) include/test/mir/test/display_config_matchers.h (+5/-0) include/test/mir/test/signal.h (+7/-0) src/client/mir_connection.cpp (+45/-22) src/client/mir_connection.h (+3/-0) src/client/mir_connection_api.cpp (+19/-0) src/client/rpc/mir_display_server.cpp (+7/-0) src/client/rpc/mir_display_server.h (+4/-0) src/client/symbols.map (+2/-0) src/include/common/mir/protobuf/display_server.h (+4/-0) src/include/server/mir/frontend/display_changer.h (+1/-0) src/server/frontend/authorizing_display_changer.cpp (+9/-0) src/server/frontend/authorizing_display_changer.h (+2/-0) src/server/frontend/protobuf_message_processor.cpp (+4/-0) src/server/frontend/session_mediator.cpp (+16/-1) src/server/frontend/session_mediator.h (+4/-0) src/server/graphics/display_configuration_observer_multiplexer.cpp (+13/-0) src/server/graphics/display_configuration_observer_multiplexer.h (+9/-0) src/server/report/logging/display_configuration_report.cpp (+15/-1) src/server/report/logging/display_configuration_report.h (+9/-0) src/server/scene/mediating_display_changer.cpp (+39/-1) src/server/scene/mediating_display_changer.h (+1/-0) tests/acceptance-tests/test_nested_mir.cpp (+2/-0) tests/acceptance-tests/test_new_display_configuration.cpp (+273/-0) tests/include/mir/test/doubles/null_display_changer.h (+3/-0) tests/include/mir/test/doubles/stub_display_server.h (+4/-0) tests/mir_test/display_config_matchers.cpp (+9/-0) tests/unit-tests/scene/test_mediating_display_changer.cpp (+4/-0)
To merge this branch:	bzr merge lp:~brandontschaefer/mir/client-api-apply-remove-display-config
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-12-23
Chris Halse Rogers		2016-12-09	Approve on 2016-12-22
Alan Griffiths			Approve on 2016-12-13
Daniel van Vugt			Abstain on 2016-12-12
Review via email: mp+312951@code.launchpad.net

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-09:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-10:

#

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

FAILED: Continuous integration, rev:3873
https://mir-jenkins.ubuntu.com/job/mir-ci/2363/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3078/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3145
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3137
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3137
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3137
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3107
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3107/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/3107
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3107/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3107
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3107/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3107/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3107/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/3107
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3107/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/3107
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3107/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-10:

#

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

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

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

review: Approve (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2016-12-11:

#

13 + * to get notified about hardware changes, so that the can apply a new config.
Typo, the→they

15 + * \warning This request may be denied. Check that the request succeeded with mir_connection_get_error_message.
You've copy-pasted these warnings. They don't apply; clients get notified via their registered error handler.

252 + mir::protobuf::Void * response,
Nit: Coding style

291 + virtual void remove(std::shared_ptr<Session> const&) = 0;
Not wild on the naming - could this be remove_session_configuration?

336 + else if ("remove_display" == invocation.method_name())
And likewise, "remove_display_configuration" (or some equivalent)?

532 +void ms::MediatingDisplayChanger::remove(
533 + std::shared_ptr<mf::Session> const& session)
534 +{
535 + std::lock_guard<std::mutex> lg{configuration_mutex};
536 + config_map.erase(session);
537 + observer->session_configuration_removed(session);
538 +}
Shouldn't this result in a hardware configuration change if (and only if) the session is currently focused? This will result in the configuration being set to the base config the *next* time the session is focused.

Which leads me into: please add some acceptance tests testing the expected behaviour. Particularly:
1) That calling remove_session_display_config from a client that hasn't set a session configuration is a no-op
2) That calling remove_session_display_config from a *focused* client that *has* set a session configuration results in a hardware configuration change
3) That calling remove_session_display_config from an *unfocused* client that *has* set a session configuration results in *no* hardware configuration change
4) That calling remove_session_display_config from an *unfocused* client that *has* set a session configuration results in the base configuration getting applied when the client becomes focused.

review: Needs Fixing

Revision history for this message

Chris Halse Rogers (raof) wrote on 2016-12-11:

#

(There are more acceptance tests you could sensibly add, but those are the 4 big ones)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-12-12:

#

You have just rejected my branch based on the assertion that "_config" should be renamed to "_configuration". So you should probably follow your own advice...

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-12-12:

#

Although I still prefer "config" over "configuration", it should be said.

Regardless, the type name and the function names should match up. Either:
   MirDisplayConfig
   mir..._display_config_...()
or
   MirDisplayConfiguration
   mir..._display_configuration_...()

For a more clear way forward that gets us closer to this ideal, I have already proposed:
https://code.launchpad.net/~vanvugt/mir/mir-display-config-header/+merge/311246
which you should probably revisit. Either fix this branch or retract your review of my branch.

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-12-12:

#

Specifically, according to your own comments we need to rename display_config_ to display_configuration, and here you are proposing the opposite of that, actually making the problem worse.

If you believe that MirDisplayConfig and _display_config is the way forward then you should retract your review of:
https://code.launchpad.net/~vanvugt/mir/mir-display-config-header/+merge/311246

If not then you should change "config" to "configuration" here. I know we're in limbo right now with the old API hanging around, but we should reject changes like this that make the problem worse, if indeed the team believes that the word "config" is the problem.

Brandon Schaefer (brandontschaefer) wrote on 2016-12-10:
I would like to think we were all doing our jobs. Im still in favour of MirDisplayConfiguration. 6 characters isnt *to* many extra characters to type. Yes it break ABI, yes it'll be a bit more work. We are already planning on breaking the ABI. I dont see a reason we should avoid this when a majority of us agreed on a name already.

review: Needs Fixing

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-12-12:

#

On second thoughts, since this is actually the style I want, I shouldn't block it.

However if this lands then it conflicts with the justification for rejecting:
https://code.launchpad.net/~vanvugt/mir/mir-display-config-header/+merge/311246
So that should be revisited.

review: Abstain

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-12-12:

#

*Needs Information*

I'm not entirely sure about the direction here. Surely the "old configuration API" is the set of functions using MirDisplayConfiguration*?

In which case, you've missed:

MirBlob* mir_blob_from_display_configuration(MirDisplayConfiguration* configuration);

and

MirDisplayConfiguration* mir_blob_to_display_configuration(MirBlob* blob);

(Yes, I know these have the intended form of the "future" API, but AIUI they have to go before we can eliminate MirDisplayConfiguration* and rename MirDisplayConfig* as planned or confusion will ensue.)

Can you (or other reviewers) clarify?

review: Needs Information

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-12-12:

#

> 13 + * to get notified about hardware changes, so that the can apply a
> new config.
> Typo, the→they
>
> 15 + * \warning This request may be denied. Check that the request
> succeeded with mir_connection_get_error_message.
> You've copy-pasted these warnings. They don't apply; clients get notified via
> their registered error handler.
>
> 252 + mir::protobuf::Void * response,
> Nit: Coding style
>
> 291 + virtual void remove(std::shared_ptr<Session> const&) = 0;
> Not wild on the naming - could this be remove_session_configuration?
>
> 336 + else if ("remove_display" == invocation.method_name())
> And likewise, "remove_display_configuration" (or some equivalent)?

All good suggestions.

>
> 532 +void ms::MediatingDisplayChanger::remove(
> 533 + std::shared_ptr<mf::Session> const& session)
> 534 +{
> 535 + std::lock_guard<std::mutex> lg{configuration_mutex};
> 536 + config_map.erase(session);
> 537 + observer->session_configuration_removed(session);
> 538 +}
> Shouldn't this result in a hardware configuration change if (and only if) the
> session is currently focused? This will result in the configuration being set
> to the base config the *next* time the session is focused.

Hmm yes, i would think that sounds like a better behaviour.

>
> Which leads me into: please add some acceptance tests testing the expected
> behaviour. Particularly:
> 1) That calling remove_session_display_config from a client that hasn't set a
> session configuration is a no-op
> 2) That calling remove_session_display_config from a *focused* client that
> *has* set a session configuration results in a hardware configuration change
> 3) That calling remove_session_display_config from an *unfocused* client that
> *has* set a session configuration results in *no* hardware configuration
> change
> 4) That calling remove_session_display_config from an *unfocused* client that
> *has* set a session configuration results in the base configuration getting
> applied when the client becomes focused.

Good idea, I was thinking about doing some of these tests but ... wasnt sure.

I also wanted to write some unit test which matched the set session config but theres no accessing point to the config_map[]. Soo I think EXEPCT_CALLS(_) are still fine. Plus these other tests.

> 13      + * to get notified about hardware changes, so that the can apply a
> new config.
> Typo, the→they
> 
> 15      + *   \warning This request may be denied. Check that the request
> succeeded with mir_connection_get_error_message.
> You've copy-pasted these warnings. They don't apply; clients get notified via
> their registered error handler.
> 
> 252     +        mir::protobuf::Void * response,
> Nit: Coding style
> 
> 291     +    virtual void remove(std::shared_ptr<Session> const&) = 0;
> Not wild on the naming - could this be remove_session_configuration?
> 
> 336     +        else if ("remove_display" == invocation.method_name())
> And likewise, "remove_display_configuration" (or some equivalent)?

All good suggestions.

> 
> 532     +void ms::MediatingDisplayChanger::remove(
> 533     +    std::shared_ptr<mf::Session> const& session)
> 534     +{
> 535     +    std::lock_guard<std::mutex> lg{configuration_mutex};
> 536     +    config_map.erase(session);
> 537     +    observer->session_configuration_removed(session);
> 538     +}
> Shouldn't this result in a hardware configuration change if (and only if) the
> session is currently focused? This will result in the configuration being set
> to the base config the *next* time the session is focused.

Hmm yes, i would think that sounds like a better behaviour.

> 
> Which leads me into: please add some acceptance tests testing the expected
> behaviour. Particularly:
> 1) That calling remove_session_display_config from a client that hasn't set a
> session configuration is a no-op
> 2) That calling remove_session_display_config from a *focused* client that
> *has* set a session configuration results in a hardware configuration change
> 3) That calling remove_session_display_config from an *unfocused* client that
> *has* set a session configuration results in *no* hardware configuration
> change
> 4) That calling remove_session_display_config from an *unfocused* client that
> *has* set a session configuration results in the base configuration getting
> applied when the client becomes focused.

Good idea, I was thinking about doing some of these tests but ... wasnt sure.

I also wanted to write some unit test which matched the set session config but theres no accessing point to the config_map[]. Soo I think EXEPCT_CALLS(_) are still fine. Plus these other tests.

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-12-12:

#

> Specifically, according to your own comments we need to rename display_config_
> to display_configuration, and here you are proposing the opposite of that,
> actually making the problem worse.
>
> If you believe that MirDisplayConfig and _display_config is the way forward
> then you should retract your review of:
> https://code.launchpad.net/~vanvugt/mir/mir-display-config-
> header/+merge/311246
>
> If not then you should change "config" to "configuration" here. I know we're
> in limbo right now with the old API hanging around, but we should reject
> changes like this that make the problem worse, if indeed the team believes
> that the word "config" is the problem.
>
> Brandon Schaefer (brandontschaefer) wrote on 2016-12-10:
> I would like to think we were all doing our jobs. Im still in favour of
> MirDisplayConfiguration. 6 characters isnt *to* many extra characters to type.
> Yes it break ABI, yes it'll be a bit more work. We are already planning on
> breaking the ABI. I dont see a reason we should avoid this when a majority of
> us agreed on a name already.

Yes and I still agree with it. I was leaving it how it currently is, *_display_config == new API and
*_display_configuration == old API. With the idea that once we get these functions in we then can deprecate the old set of functions then get a branch to rename them all to *_display_configuration.

Though I could still just move to display_configuration vs waiting, figured it would be more uniformed to have a branch that renames everything.

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-12-12:

#

> *Needs Information*
>
> I'm not entirely sure about the direction here. Surely the "old configuration
> API" is the set of functions using MirDisplayConfiguration*?

Yes

>
> In which case, you've missed:
>
> MirBlob* mir_blob_from_display_configuration(MirDisplayConfiguration*
> configuration);
>
> and
>
> MirDisplayConfiguration* mir_blob_to_display_configuration(MirBlob* blob);
>

Hmm yes, there is no blob for MirDisplayConfig

> (Yes, I know these have the intended form of the "future" API, but AIUI they
> have to go before we can eliminate MirDisplayConfiguration* and rename
> MirDisplayConfig* as planned or confusion will ensue.)
>
> Can you (or other reviewers) clarify?

Ill get this doubled checked as this is the main goal of this branch to be able to deprecate the old display config way!

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-12-13:

#

> > *Needs Information*
> >
> > I'm not entirely sure about the direction here. Surely the "old
> configuration
> > API" is the set of functions using MirDisplayConfiguration*?
>
> Yes
>
> >
> > In which case, you've missed:
> >
> > MirBlob* mir_blob_from_display_configuration(MirDisplayConfiguration*
> > configuration);
> >
> > and
> >
> > MirDisplayConfiguration* mir_blob_to_display_configuration(MirBlob* blob);
> >
>
> Hmm yes, there is no blob for MirDisplayConfig

AFAICS the MP is OK except the commit message needs to say "Add two of the missing functions needed to remove the old display configuration API."

Regarding the blobs: don't forget that blobs may have been created by the legacy API - we may need to support loading both versions (if they differ).

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2016-12-13:

#

> AFAICS the MP is OK except the commit message needs to say "Add two of the
> missing functions needed to remove the old display configuration API."

Fixed

review: Approve

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-12-13:

#

Yup Ill be doing the blob after this branch.

@duflu

I agree, I should just change the name now, theres no point in making any more annoying since they already have a unique name. Thanks!

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-16:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-16:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-16:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-16:

#

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

FAILED: Continuous integration, rev:3878
https://mir-jenkins.ubuntu.com/job/mir-ci/2414/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3145/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3212
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3204
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3204
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3204
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3174
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3174/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/3174
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3174/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3174/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3174
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3174/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/3174
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3174/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/3174
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3174/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-12-16:

#

https://bugs.launchpad.net/mir/+bug/1646558

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-16:

#

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

FAILED: Continuous integration, rev:3878
https://mir-jenkins.ubuntu.com/job/mir-ci/2419/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3150/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3217
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3209
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3209
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3209
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3179/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3179
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3179/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3179
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3179/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3179/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3179/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/3179
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3179/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/3179
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3179/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-20:

#

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

FAILED: Continuous integration, rev:3878
https://mir-jenkins.ubuntu.com/job/mir-ci/2444/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3187/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3254
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3246
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3246
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3246
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3216/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3216
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3216/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3216
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3216/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/3216
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3216/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/3216
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3216/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/3216
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3216/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2016-12-22:

#

LGTM.

Failure is bug# 1649758.

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-22:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2016-12-23:

#

04:21:54 Text conflict in src/client/symbols.map
04:21:54 1 conflicts encountered.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-12-23:

#

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

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

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

review: Approve (continuous-integration)

Mir

Merge lp:~brandontschaefer/mir/client-api-apply-remove-display-config into lp:mir

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'include/client/mir_toolkit/mir_connection.h'
 --- include/client/mir_toolkit/mir_connection.h	2016-10-12 06:03:15 +0000
 +++ include/client/mir_toolkit/mir_connection.h	2016-12-23 15:34:22 +0000
@@ -202,6 +202,30 @@
  MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration);
  /**
++ * Apply the display configuration for the connection
++ *
++ * The display configuration is applied to this connection only (per-connection
++ * configuration) and is invalidated when a hardware change occurs. Clients should
++ * register a callback with mir_connection_set_display_config_change_callback()
++ * to get notified about hardware changes, so that they can apply a new configuration.
++ *
++ *   \param [in] connection             The connection
++ *   \param [in] display_config         The display_config to apply
++ */
++void mir_connection_apply_session_display_configuration(MirConnection* connection, MirDisplayConfig const* display_config);
++
++/**
++ * Remove the display configuration for the connection
++ *
++ * If a session display configuration is applied to the connection it is removed, and
++ * the base display configuration is used. If there was no previous call to
++ * mir_connection_apply_session_display_config this will do nothing.
++ *
++ *   \param [in] connection             The connection
++ */
++void mir_connection_remove_session_display_configuration(MirConnection* connection);
++
++/**
   * Set the base display configuration
+  *
   * The base display configuration is the configuration the server applies when
 === modified file 'include/server/mir/graphics/display_configuration_observer.h'
 --- include/server/mir/graphics/display_configuration_observer.h	2016-12-09 02:54:31 +0000
 +++ include/server/mir/graphics/display_configuration_observer.h	2016-12-23 15:34:22 +0000
@@ -24,6 +24,10 @@
  namespace mir
+ {
++namespace frontend
++{
++class Session;
++}
  namespace graphics
+ {
  class DisplayConfiguration;
@@ -58,6 +62,21 @@
      virtual void base_configuration_updated(std::shared_ptr<DisplayConfiguration const> const& base_config) = 0;
      /**
++     * Notification after updating the session display configuration.
++     *
++     * \param [in] session  The session that is updating its display configuration.
++     * \param [in] config   The configuration that is being applied to the session.
++     */
++    virtual void session_configuration_applied(std::shared_ptr<frontend::Session> const& session,
++        std::shared_ptr<DisplayConfiguration> const& config) = 0;
++    /**
++     * Notification after removing the session display configuration.
++     *
++     * \param [in] session  The session that is removing its display configuration.
++     */
++    virtual void session_configuration_removed(std::shared_ptr<frontend::Session> const& session) = 0;
++
++    /**
       * Notification after every failed display configuration attempt.
+      *
       * This is called if the graphics platform throws an exception when trying
 === modified file 'include/test/mir/test/display_config_matchers.h'
 --- include/test/mir/test/display_config_matchers.h	2016-11-02 05:07:18 +0000
 +++ include/test/mir/test/display_config_matchers.h	2016-12-23 15:34:22 +0000
@@ -111,6 +111,11 @@
      MirDisplayConfig const* config1,
      MirDisplayConfig const* config2);
++bool compare_display_configurations(
++    testing::MatchResultListener* listener,
++    std::shared_ptr<graphics::DisplayConfiguration> const& config1,
++    MirDisplayConfig const* config2);
++
  MATCHER_P(DisplayConfigMatches, config, "")
+ {
      return compare_display_configurations(result_listener, arg, config);
 === modified file 'include/test/mir/test/signal.h'
 --- include/test/mir/test/signal.h	2016-07-18 07:38:38 +0000
 +++ include/test/mir/test/signal.h	2016-12-23 15:34:22 +0000
@@ -69,6 +69,13 @@
+ {
      signal->raise();
+ }
++ACTION_P2(WakeUpWhenZero, signal, atomic_int)
++{
++    if (atomic_int->fetch_sub(1) == 1)
++    {
++        signal->raise();
++    }
++}
+ }
+ }
 === modified file 'src/client/mir_connection.cpp'
 --- src/client/mir_connection.cpp	2016-12-14 19:53:10 +0000
 +++ src/client/mir_connection.cpp	2016-12-23 15:34:22 +0000
@@ -1054,13 +1054,15 @@
  namespace
+ {
--struct HandleErrorVoid
++template <class T>
++struct HandleError
+ {
--    std::unique_ptr<mp::Void> result;
--    std::function<void(mp::Void const&)> on_error;
++    std::unique_ptr<T> result;
++    std::function<void(T const&)> on_error;
  };
--void handle_structured_error(HandleErrorVoid* handler)
++template <class T>
++void handle_structured_error(HandleError<T>* handler)
+ {
      if (handler->result->has_structured_error())
+     {
@@ -1068,6 +1070,22 @@
+     }
      delete handler;
+ }
++
++template <class T>
++HandleError<T>* create_stored_error_result(std::shared_ptr<mcl::ErrorHandler> const& error_handler)
++{
++    auto store_error_result = new HandleError<T>;
++    store_error_result->result = std::make_unique<T>();
++    store_error_result->on_error = [error_handler](T const& message)
++    {
++        MirError const error{
++            static_cast<MirErrorDomain>(message.structured_error().domain()),
++            message.structured_error().code()};
++        (*error_handler)(&error);
++    };
++
++    return store_error_result;
++}
+ }
  void MirConnection::preview_base_display_configuration(
@@ -1079,15 +1097,7 @@
      request.mutable_configuration()->CopyFrom(configuration);
      request.set_timeout(timeout.count());
--    auto store_error_result = new HandleErrorVoid;
--    store_error_result->result = std::make_unique<mp::Void>();
--    store_error_result->on_error = [this](mp::Void const& message)
--    {
--        MirError const error{
--            static_cast<MirErrorDomain>(message.structured_error().domain()),
--            message.structured_error().code()};
--        (*error_handler)(&error);
--    };
++    auto store_error_result = create_stored_error_result<mp::Void>(error_handler);
      server.preview_base_display_configuration(
          &request,
@@ -1099,15 +1109,7 @@
+ {
      mp::Void request;
--    auto store_error_result = new HandleErrorVoid;
--    store_error_result->result = std::make_unique<mp::Void>();
--    store_error_result->on_error = [this](mp::Void const& message)
--    {
--        MirError const error{
--            static_cast<MirErrorDomain>(message.structured_error().domain()),
--            message.structured_error().code()};
--        (*error_handler)(&error);
--    };
++    auto store_error_result = create_stored_error_result<mp::Void>(error_handler);
      server.cancel_base_display_configuration_preview(
          &request,
@@ -1115,6 +1117,27 @@
          google::protobuf::NewCallback(&handle_structured_error, store_error_result));
+ }
++void MirConnection::configure_session_display(mp::DisplayConfiguration const& configuration)
++{
++    auto store_error_result = create_stored_error_result<mp::DisplayConfiguration>(error_handler);
++
++    server.configure_display(
++        &configuration,
++        store_error_result->result.get(),
++        google::protobuf::NewCallback(&handle_structured_error, store_error_result));
++}
++
++void MirConnection::remove_session_display()
++{
++    mp::Void request;
++    auto store_error_result = create_stored_error_result<mp::Void>(error_handler);
++
++    server.remove_session_configuration(
++        &request,
++        store_error_result->result.get(),
++        google::protobuf::NewCallback(&handle_structured_error, store_error_result));
++}
++
  void MirConnection::confirm_base_display_configuration(
      mp::DisplayConfiguration const& configuration)
+ {
 === modified file 'src/client/mir_connection.h'
 --- src/client/mir_connection.h	2016-12-14 19:53:10 +0000
 +++ src/client/mir_connection.h	2016-12-23 15:34:22 +0000
@@ -187,6 +187,9 @@
      MirWaitHandle* configure_display(MirDisplayConfiguration* configuration);
      void done_display_configure();
++    void configure_session_display(mir::protobuf::DisplayConfiguration const& configuration);
++    void remove_session_display();
++
      MirWaitHandle* set_base_display_configuration(MirDisplayConfiguration const* configuration);
      void preview_base_display_configuration(
          mir::protobuf::DisplayConfiguration const& configuration,
 === modified file 'src/client/mir_connection_api.cpp'
 --- src/client/mir_connection_api.cpp	2016-12-13 06:00:32 +0000
 +++ src/client/mir_connection_api.cpp	2016-12-23 15:34:22 +0000
@@ -427,3 +427,22 @@
+     }
+ }
++void mir_connection_apply_session_display_configuration(MirConnection* connection, MirDisplayConfig const* display_config)
++try
++{
++    connection->configure_session_display(*display_config);
++}
++catch (std::exception const& ex)
++{
++    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
++}
++
++void mir_connection_remove_session_display_configuration(MirConnection* connection)
++try
++{
++    connection->remove_session_display();
++}
++catch (std::exception const& ex)
++{
++    MIR_LOG_UNCAUGHT_EXCEPTION(ex);
++}
 === modified file 'src/client/rpc/mir_display_server.cpp'
 --- src/client/rpc/mir_display_server.cpp	2016-11-28 16:58:23 +0000
 +++ src/client/rpc/mir_display_server.cpp	2016-12-23 15:34:22 +0000
@@ -84,6 +84,13 @@
+ {
      channel->call_method(std::string(__func__), request, response, done);
+ }
++void mclr::DisplayServer::remove_session_configuration(
++    mir::protobuf::Void const* request,
++    mir::protobuf::Void* response,
++    google::protobuf::Closure* done)
++{
++    channel->call_method(std::string(__func__), request, response, done);
++}
  void mclr::DisplayServer::set_base_display_configuration(
      mir::protobuf::DisplayConfiguration const* request,
      mir::protobuf::Void* response,
 === modified file 'src/client/rpc/mir_display_server.h'
 --- src/client/rpc/mir_display_server.h	2016-11-28 16:58:23 +0000
 +++ src/client/rpc/mir_display_server.h	2016-12-23 15:34:22 +0000
@@ -67,6 +67,10 @@
          mir::protobuf::DisplayConfiguration const* request,
          mir::protobuf::DisplayConfiguration* response,
          google::protobuf::Closure* done) override;
++    void remove_session_configuration(
++        mir::protobuf::Void const* request,
++        mir::protobuf::Void* response,
++        google::protobuf::Closure* done) override;
      void set_base_display_configuration(
          mir::protobuf::DisplayConfiguration const* request,
          mir::protobuf::Void* response,
 === modified file 'src/client/symbols.map'
 --- src/client/symbols.map	2016-12-23 04:18:57 +0000
 +++ src/client/symbols.map	2016-12-23 15:34:22 +0000
@@ -500,6 +500,8 @@
      mir_touchpad_configuration_set_tap_to_click;
      mir_connection_request_extension;
      mir_output_get_model;
++    mir_connection_apply_session_display_configuration;
++    mir_connection_remove_session_display_configuration;
      mir_blob_from_display_config;
      mir_blob_to_display_config;
  } MIR_CLIENT_0.25;
 === modified file 'src/include/common/mir/protobuf/display_server.h'
 --- src/include/common/mir/protobuf/display_server.h	2016-11-28 16:58:23 +0000
 +++ src/include/common/mir/protobuf/display_server.h	2016-12-23 15:34:22 +0000
@@ -63,6 +63,10 @@
          mir::protobuf::DisplayConfiguration const* request,
          mir::protobuf::DisplayConfiguration* response,
          google::protobuf::Closure* done) = 0;
++    virtual void remove_session_configuration(
++        mir::protobuf::Void const* request,
++        mir::protobuf::Void* response,
++        google::protobuf::Closure* done) = 0;
      virtual void set_base_display_configuration(
          mir::protobuf::DisplayConfiguration const* request,
          mir::protobuf::Void* response,
 === modified file 'src/include/server/mir/frontend/display_changer.h'
 --- src/include/server/mir/frontend/display_changer.h	2016-10-12 06:03:15 +0000
 +++ src/include/server/mir/frontend/display_changer.h	2016-12-23 15:34:22 +0000
@@ -39,6 +39,7 @@
      virtual std::shared_ptr<graphics::DisplayConfiguration> base_configuration() = 0;
      virtual void configure(std::shared_ptr<Session> const&, std::shared_ptr<graphics::DisplayConfiguration> const&) = 0;
++    virtual void remove_session_configuration(std::shared_ptr<Session> const&) = 0;
      virtual void set_base_configuration(std::shared_ptr<graphics::DisplayConfiguration> const&) = 0;
      virtual void preview_base_configuration(
          std::weak_ptr<Session> const& session,
 === modified file 'src/server/frontend/authorizing_display_changer.cpp'
 --- src/server/frontend/authorizing_display_changer.cpp	2016-10-12 06:03:15 +0000
 +++ src/server/frontend/authorizing_display_changer.cpp	2016-12-23 15:34:22 +0000
@@ -69,6 +69,15 @@
          BOOST_THROW_EXCEPTION(std::runtime_error("not authorized to apply display configurations"));
+ }
++void mf::AuthorizingDisplayChanger::remove_session_configuration(
++    std::shared_ptr<mf::Session> const& session)
++{
++    if (configure_display_is_allowed)
++        changer->remove_session_configuration(session);
++    else
++        BOOST_THROW_EXCEPTION(std::runtime_error("not authorized to remove display configurations"));
++}
++
  void mf::AuthorizingDisplayChanger::set_base_configuration(
      std::shared_ptr<graphics::DisplayConfiguration> const& config)
+ {
 === modified file 'src/server/frontend/authorizing_display_changer.h'
 --- src/server/frontend/authorizing_display_changer.h	2016-10-12 06:03:15 +0000
 +++ src/server/frontend/authorizing_display_changer.h	2016-12-23 15:34:22 +0000
@@ -49,6 +49,8 @@
      void configure(
          std::shared_ptr<frontend::Session> const&,
          std::shared_ptr<graphics::DisplayConfiguration> const&) override;
++    void remove_session_configuration(
++        std::shared_ptr<frontend::Session> const&) override;
      void set_base_configuration(
          std::shared_ptr<graphics::DisplayConfiguration> const&) override;
      void preview_base_configuration(
 === modified file 'src/server/frontend/protobuf_message_processor.cpp'
 --- src/server/frontend/protobuf_message_processor.cpp	2016-11-28 16:58:23 +0000
 +++ src/server/frontend/protobuf_message_processor.cpp	2016-12-23 15:34:22 +0000
@@ -249,6 +249,10 @@
+         {
              invoke(this, display_server.get(), &DisplayServer::configure_display, invocation);
+         }
++        else if ("remove_session_configuration" == invocation.method_name())
++        {
++            invoke(this, display_server.get(), &DisplayServer::remove_session_configuration, invocation);
++        }
          else if ("set_base_display_configuration" == invocation.method_name())
+         {
              invoke(this, display_server.get(), &DisplayServer::set_base_display_configuration, invocation);
 === modified file 'src/server/frontend/session_mediator.cpp'
 --- src/server/frontend/session_mediator.cpp	2016-12-21 03:07:05 +0000
 +++ src/server/frontend/session_mediator.cpp	2016-12-23 15:34:22 +0000
@@ -646,7 +646,7 @@
+ }
  void mf::SessionMediator::configure_display(
--    const ::mir::protobuf::DisplayConfiguration* request,
++    ::mir::protobuf::DisplayConfiguration const* request,
      ::mir::protobuf::DisplayConfiguration* response,
      ::google::protobuf::Closure* done)
+ {
@@ -666,6 +666,21 @@
      done->Run();
+ }
++void mf::SessionMediator::remove_session_configuration(
++    ::mir::protobuf::Void const* /*request*/,
++    ::mir::protobuf::Void* /*response*/,
++    ::google::protobuf::Closure* done)
++{
++    auto session = weak_session.lock();
++
++    if (session.get() == nullptr)
++        BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
++
++    display_changer->remove_session_configuration(session);
++
++    done->Run();
++}
++
  void mf::SessionMediator::set_base_display_configuration(
      mir::protobuf::DisplayConfiguration const* request,
      mir::protobuf::Void* /*response*/,
 === modified file 'src/server/frontend/session_mediator.h'
 --- src/server/frontend/session_mediator.h	2016-11-28 16:58:23 +0000
 +++ src/server/frontend/session_mediator.h	2016-12-23 15:34:22 +0000
@@ -144,6 +144,10 @@
          mir::protobuf::DisplayConfiguration const* request,
          mir::protobuf::DisplayConfiguration* response,
          google::protobuf::Closure* done) override;
++    void remove_session_configuration(
++        mir::protobuf::Void const* request,
++        mir::protobuf::Void* response,
++        google::protobuf::Closure* done) override;
      void set_base_display_configuration(
          mir::protobuf::DisplayConfiguration const* request,
          mir::protobuf::Void* response,
 === modified file 'src/server/graphics/display_configuration_observer_multiplexer.cpp'
 --- src/server/graphics/display_configuration_observer_multiplexer.cpp	2016-12-09 02:54:31 +0000
 +++ src/server/graphics/display_configuration_observer_multiplexer.cpp	2016-12-23 15:34:22 +0000
@@ -38,6 +38,19 @@
      for_each_observer(&mg::DisplayConfigurationObserver::base_configuration_updated, base_config);
+ }
++void mg::DisplayConfigurationObserverMultiplexer::session_configuration_applied(
++    std::shared_ptr<frontend::Session> const& session,
++    std::shared_ptr<DisplayConfiguration> const& config)
++{
++    for_each_observer(&mg::DisplayConfigurationObserver::session_configuration_applied, session, config);
++}
++
++void mg::DisplayConfigurationObserverMultiplexer::session_configuration_removed(
++    std::shared_ptr<frontend::Session> const& session)
++{
++    for_each_observer(&mg::DisplayConfigurationObserver::session_configuration_removed, session);
++}
++
  void mg::DisplayConfigurationObserverMultiplexer::configuration_failed(
      std::shared_ptr<mg::DisplayConfiguration const> const& attempted,
      std::exception const& error)
 === modified file 'src/server/graphics/display_configuration_observer_multiplexer.h'
 --- src/server/graphics/display_configuration_observer_multiplexer.h	2016-12-09 02:54:31 +0000
 +++ src/server/graphics/display_configuration_observer_multiplexer.h	2016-12-23 15:34:22 +0000
@@ -25,6 +25,10 @@
  namespace mir
+ {
++namespace frontend
++{
++class Session;
++}
  namespace graphics
+ {
  class DisplayConfigurationObserverMultiplexer : public ObserverMultiplexer<DisplayConfigurationObserver>
@@ -38,6 +42,11 @@
      void base_configuration_updated(std::shared_ptr<DisplayConfiguration const> const& base_config) override;
++    void session_configuration_applied(std::shared_ptr<frontend::Session> const& session,
++                                       std::shared_ptr<DisplayConfiguration> const& config) override;
++
++    void session_configuration_removed(std::shared_ptr<frontend::Session> const& session) override;
++
      void configuration_failed(
          std::shared_ptr<DisplayConfiguration const> const& attempted,
          std::exception const& error) override;
 === modified file 'src/server/report/logging/display_configuration_report.cpp'
 --- src/server/report/logging/display_configuration_report.cpp	2016-12-14 04:09:02 +0000
 +++ src/server/report/logging/display_configuration_report.cpp	2016-12-23 15:34:22 +0000
@@ -20,11 +20,13 @@
  #include "mir/graphics/display_configuration.h"
  #include "mir/output_type_names.h"
  #include "mir/logging/logger.h"
++#include "mir/frontend/session.h"
  #include "mir/graphics/edid.h"
  #include <boost/exception/diagnostic_information.hpp>
  #include <cmath>
++namespace mf = mir::frontend;
  namespace mg = mir::graphics;
  namespace ml = mir::logging;
  namespace mrl= mir::report::logging;
@@ -65,6 +67,18 @@
      log_configuration(severity, *base_config);
+ }
++void mrl::DisplayConfigurationReport::session_configuration_applied(std::shared_ptr<mf::Session> const& session,
++                                   std::shared_ptr<mg::DisplayConfiguration> const& config)
++{
++    logger->log(component, severity, "Session %s applied display configuration", session->name().c_str());
++    log_configuration(severity, *config);
++}
++
++void mrl::DisplayConfigurationReport::session_configuration_removed(std::shared_ptr<frontend::Session> const& session)
++{
++    logger->log(component, severity, "Session %s removed display configuration", session->name().c_str());
++}
++
  void mrl::DisplayConfigurationReport::configuration_failed(
      std::shared_ptr<mg::DisplayConfiguration const> const& attempted,
      std::exception const& error)
@@ -123,7 +137,7 @@
                  {"on", "in standby", "suspended", "off"};
              logger->log(component, severity,
                          "%sPower is %s", indent, power_mode[out.power_mode]);
--
++
              if (out.used)
+             {
                  if (out.current_mode_index < out.modes.size())
 === modified file 'src/server/report/logging/display_configuration_report.h'
 --- src/server/report/logging/display_configuration_report.h	2016-12-09 02:54:31 +0000
 +++ src/server/report/logging/display_configuration_report.h	2016-12-23 15:34:22 +0000
@@ -27,6 +27,10 @@
+ {
  namespace logging { class Logger; enum class Severity; }
++namespace frontend
++{
++class Session;
++}
  namespace report
+ {
  namespace logging
@@ -42,6 +46,11 @@
      void base_configuration_updated(std::shared_ptr<graphics::DisplayConfiguration const> const& base_config) override;
++    void session_configuration_applied(std::shared_ptr<frontend::Session> const& session,
++                                       std::shared_ptr<graphics::DisplayConfiguration> const& config) override;
++
++    void session_configuration_removed(std::shared_ptr<frontend::Session> const& session) override;
++
      void configuration_failed(
          std::shared_ptr<graphics::DisplayConfiguration const> const& attempted,
          std::exception const& error) override;
 === modified file 'src/server/scene/mediating_display_changer.cpp'
 --- src/server/scene/mediating_display_changer.cpp	2016-12-09 02:54:31 +0000
 +++ src/server/scene/mediating_display_changer.cpp	2016-12-23 15:34:22 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2013 Canonical Ltd.
++ * Copyright © 2013-2016 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 3,
@@ -191,6 +191,7 @@
+     {
          std::lock_guard<std::mutex> lg{configuration_mutex};
          config_map[session] = conf;
++        observer->session_configuration_applied(session, conf);
          if (session != focused_session.lock())
              return;
@@ -222,6 +223,43 @@
          });
+ }
++void ms::MediatingDisplayChanger::remove_session_configuration(
++    std::shared_ptr<mf::Session> const& session)
++{
++    {
++        std::lock_guard<std::mutex> lg{configuration_mutex};
++        if (config_map.find(session) != config_map.end())
++        {
++            config_map.erase(session);
++            observer->session_configuration_removed(session);
++        }
++
++        if (session != focused_session.lock())
++            return;
++    }
++
++    std::weak_ptr<mf::Session> const weak_session{session};
++
++    server_action_queue->enqueue(
++        this,
++        [this, weak_session]
++        {
++            if (auto const session = weak_session.lock())
++            {
++                std::lock_guard<std::mutex> lg{configuration_mutex};
++
++                try
++                {
++                    apply_base_config();
++                }
++                catch (std::exception const&)
++                {
++                    session->send_error(DisplayConfigurationFailedError{});
++                }
++            }
++        });
++}
++
  void
  ms::MediatingDisplayChanger::preview_base_configuration(
      std::weak_ptr<frontend::Session> const& session,
 === modified file 'src/server/scene/mediating_display_changer.h'
 --- src/server/scene/mediating_display_changer.h	2016-11-15 23:48:01 +0000
 +++ src/server/scene/mediating_display_changer.h	2016-12-23 15:34:22 +0000
@@ -75,6 +75,7 @@
      std::shared_ptr<graphics::DisplayConfiguration> base_configuration() override;
      void configure(std::shared_ptr<frontend::Session> const& session,
                     std::shared_ptr<graphics::DisplayConfiguration> const& conf) override;
++    void remove_session_configuration(std::shared_ptr<frontend::Session> const& session) override;
      void preview_base_configuration(
          std::weak_ptr<frontend::Session> const& session,
          std::shared_ptr<graphics::DisplayConfiguration> const& conf,
 === modified file 'tests/acceptance-tests/test_nested_mir.cpp'
 --- tests/acceptance-tests/test_nested_mir.cpp	2016-12-09 02:54:31 +0000
 +++ tests/acceptance-tests/test_nested_mir.cpp	2016-12-23 15:34:22 +0000
@@ -127,6 +127,8 @@
+ {
      MOCK_METHOD1(initial_configuration, void (std::shared_ptr<mg::DisplayConfiguration const> const& configuration));
      MOCK_METHOD1(configuration_applied, void (std::shared_ptr<mg::DisplayConfiguration const> const& configuration));
++    MOCK_METHOD2(session_configuration_applied, void (std::shared_ptr<mf::Session> const& session, std::shared_ptr<mg::DisplayConfiguration> const& configuration));
++    MOCK_METHOD1(session_configuration_removed, void (std::shared_ptr<mf::Session> const& session));
      MOCK_METHOD1(base_configuration_updated, void (std::shared_ptr<mg::DisplayConfiguration const> const& base_config));
      MOCK_METHOD2(configuration_failed, void(std::shared_ptr<mg::DisplayConfiguration const> const&, std::exception const&));
      MOCK_METHOD2(catastrophic_configuration_error, void(std::shared_ptr<mg::DisplayConfiguration const> const&, std::exception const&));
 === modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
 --- tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-12 05:13:17 +0000
 +++ tests/acceptance-tests/test_new_display_configuration.cpp	2016-12-23 15:34:22 +0000
@@ -41,6 +41,7 @@
  #include <atomic>
  #include <chrono>
++#include <mutex>
  #include <gmock/gmock.h>
  #include <gtest/gtest.h>
@@ -109,6 +110,11 @@
              return expectations.back().notifier.get_future();
+         }
++        MOCK_METHOD2(session_configuration_applied, void(
++            std::shared_ptr<mf::Session> const&,
++            std::shared_ptr<mg::DisplayConfiguration> const&));
++        MOCK_METHOD1(session_configuration_removed, void(std::shared_ptr<mf::Session> const&));
++
      protected:
          void initial_configuration(
              std::shared_ptr<mg::DisplayConfiguration const> const&) override
@@ -187,6 +193,7 @@
      testing::NiceMock<MockDisplay> mock_display;
      std::shared_ptr<NotifyingConfigurationObserver> observer{std::make_shared<NotifyingConfigurationObserver>()};
      StubAuthorizer stub_authorizer;
++    mir::test::Signal observed_changed;
  };
  TEST_F(DisplayConfigurationTest, display_configuration_reaches_client)
@@ -259,9 +266,31 @@
          connection = mir_connect_sync(mir_test_socket.c_str(), __PRETTY_FUNCTION__);
          auto const spec = mir_connection_create_spec_for_normal_surface(connection, 100, 100, mir_pixel_format_abgr_8888);
++        mir_surface_spec_set_event_handler(spec, &handle_event, this);
          surface = mir_surface_create_sync(spec);
          mir_surface_spec_release(spec);
          mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
++
++        ready_to_accept_events.wait_for(4s);
++        if (!ready_to_accept_events.raised())
++            BOOST_THROW_EXCEPTION(std::runtime_error("Timeout waiting for surface to become focused and exposed"));
++    }
++
++    static void handle_event(MirSurface*, MirEvent const* ev, void* context)
++    {
++        auto const client = static_cast<SimpleClient*>(context);
++        auto type = mir_event_get_type(ev);
++        if (type == mir_event_type_surface)
++        {
++            auto surface_event = mir_event_get_surface_event(ev);
++            auto const attrib  = mir_surface_event_get_attribute(surface_event);
++            auto const value   = mir_surface_event_get_attribute_value(surface_event);
++
++            std::lock_guard<std::mutex> lk(client->mutex);
++            if (mir_surface_attrib_focus == attrib &&
++                mir_surface_focused == value)
++                client->ready_to_accept_events.raise();
++        }
+     }
      void disconnect()
@@ -278,6 +307,9 @@
      std::string mir_test_socket;
      MirConnection* connection{nullptr};
      MirSurface* surface{nullptr};
++    mutable std::mutex mutex;
++    mir::test::Signal ready_to_accept_events;
++    bool focused{false};
  };
  struct DisplayClient : SimpleClient
@@ -1743,3 +1775,244 @@
      client.disconnect();
+ }
++
++TEST_F(DisplayConfigurationTest, configure_session_display)
++{
++    auto configuration = mir_connection_create_display_configuration(connection);
++
++    EXPECT_CALL(*observer, session_configuration_applied(_, _))
++        .Times(1)
++        .WillOnce(mt::WakeUp(&observed_changed));
++
++    mir_connection_apply_session_display_configuration(connection, configuration);
++
++    observed_changed.wait_for(10s);
++
++    mir_display_config_release(configuration);
++}
++
++TEST_F(DisplayConfigurationTest, configure_session_removed_display)
++{
++    auto configuration = mir_connection_create_display_configuration(connection);
++
++    EXPECT_CALL(*observer, session_configuration_applied(_, _))
++        .Times(1)
++        .WillOnce(mt::WakeUp(&observed_changed));
++
++    mir_connection_apply_session_display_configuration(connection, configuration);
++
++    observed_changed.wait_for(10s);
++    observed_changed.reset();
++
++    mir_connection_remove_session_display_configuration(connection);
++
++    EXPECT_CALL(*observer, session_configuration_removed(_))
++        .Times(1)
++        .WillOnce(mt::WakeUp(&observed_changed));
++
++    observed_changed.wait_for(10s);
++
++    mir_display_config_release(configuration);
++}
++
++TEST_F(DisplayConfigurationTest, remove_is_noop_when_no_session_configuration_set)
++{
++    EXPECT_CALL(*observer, session_configuration_removed(_))
++        .Times(0);
++
++    mir_connection_remove_session_display_configuration(connection);
++
++    std::this_thread::sleep_for(1s);
++}
++
++TEST_F(DisplayConfigurationTest, remove_from_focused_client_causes_hardware_change)
++{
++    DisplayClient client{new_connection()};
++
++    client.connect();
++
++    std::atomic<int> times{2};
++    auto new_config = mir_connection_create_display_configuration(client.connection);
++
++    // Apply a configuration to the client, assert it has been configured for the display
++    {
++        mir_output_set_position(mir_display_config_get_mutable_output(new_config, 0), 500, 12000);
++
++        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++
++        mir_connection_apply_session_display_configuration(client.connection, new_config);
++
++        observed_changed.wait_for(10s);
++        observed_changed.reset();
++        mir_display_config_release(new_config);
++    }
++
++    // Remove the configuration, assert we have been re-configured back to the base config
++    {
++        times = 2;
++
++        EXPECT_CALL(*observer, session_configuration_removed(_))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++
++        mir_connection_remove_session_display_configuration(client.connection);
++
++        observed_changed.wait_for(10s);
++    }
++
++    client.disconnect();
++}
++
++TEST_F(DisplayConfigurationTest, remove_from_unfocused_client_causes_no_hardware_change)
++{
++    DisplayClient client{new_connection()};
++
++    client.connect();
++
++    auto new_config = mir_connection_create_display_configuration(client.connection);
++    std::atomic<int> times{2};
++
++    // Set the first clients display config
++    {
++        mir_output_set_position(mir_display_config_get_mutable_output(new_config, 0), 500, 12000);
++
++        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++
++        mir_connection_apply_session_display_configuration(client.connection, new_config);
++
++        observed_changed.wait_for(10s);
++        observed_changed.reset();
++        mir_display_config_release(new_config);
++    }
++
++    DisplayClient client2{new_connection()};
++
++    // Connect and wait for the second client to get setup and config. Which will be the focused session
++    {
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
++            .Times(1)
++            .WillOnce(mt::WakeUp(&observed_changed));
++
++        client2.connect();
++        observed_changed.wait_for(10s);
++        observed_changed.reset();
++    }
++
++    // Remove the display config from the first config and assert no hardware changes happen
++    {
++        EXPECT_CALL(*observer, session_configuration_removed(_))
++            .Times(1)
++            .WillOnce(mt::WakeUp(&observed_changed));
++        EXPECT_CALL(mock_display, configure(_))
++            .Times(0);
++
++        mir_connection_remove_session_display_configuration(client.connection);
++
++        observed_changed.wait_for(10s);
++        std::this_thread::sleep_for(1s);
++    }
++
++    client2.disconnect();
++    client.disconnect();
++}
++
++TEST_F(DisplayConfigurationTest, remove_from_unfocused_client_causes_hardware_change_when_focused)
++{
++    DisplayClient client{new_connection()};
++
++    client.connect();
++
++    auto new_config = mir_connection_create_display_configuration(client.connection);
++    std::atomic<int> times{2};
++
++    // Set the first clients display config
++    {
++        mir_output_set_position(mir_display_config_get_mutable_output(new_config, 0), 500, 12000);
++
++        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++
++        mir_connection_apply_session_display_configuration(client.connection, new_config);
++
++        observed_changed.wait_for(10s);
++        observed_changed.reset();
++    }
++
++    DisplayClient client2{new_connection()};
++
++    // Connect and wait for the second client to get setup and config. Which will be the focused session
++    {
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
++            .Times(1)
++            .WillOnce(mt::WakeUp(&observed_changed));
++
++        client2.connect();
++        observed_changed.wait_for(10s);
++        observed_changed.reset();
++    }
++
++    // Apply the new_config to client 2 as well so we can see disconnecting will apply the base config
++    {
++        times = 2;
++
++        EXPECT_CALL(*observer, session_configuration_applied(_, mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(new_config)))
++            .Times(1)
++            .WillOnce(mt::WakeUpWhenZero(&observed_changed, &times));
++
++        mir_connection_apply_session_display_configuration(client2.connection, new_config);
++        observed_changed.wait_for(10s);
++        observed_changed.reset();
++        mir_display_config_release(new_config);
++    }
++
++    // Remove the display config from the first config and assert no hardware changes happen
++    {
++
++        EXPECT_CALL(*observer, session_configuration_removed(_))
++            .Times(1)
++            .WillOnce(mt::WakeUp(&observed_changed));
++        EXPECT_CALL(mock_display, configure(_))
++            .Times(0);
++
++        mir_connection_remove_session_display_configuration(client.connection);
++
++        observed_changed.wait_for(10s);
++        std::this_thread::sleep_for(1s);
++        observed_changed.reset();
++    }
++
++    testing::Mock::VerifyAndClearExpectations(&mock_display);
++
++    // Disconnect client 2 which makes client 1 regain focus. Assert the base config is configured
++    {
++        EXPECT_CALL(mock_display, configure(mt::DisplayConfigMatches(std::cref(stub_display_config))))
++            .Times(1)
++            .WillOnce(mt::WakeUp(&observed_changed));
++
++        client2.disconnect();
++
++        observed_changed.wait_for(10s);
++    }
++
++    client.disconnect();
++}
 === modified file 'tests/include/mir/test/doubles/null_display_changer.h'
 --- tests/include/mir/test/doubles/null_display_changer.h	2016-10-12 06:03:15 +0000
 +++ tests/include/mir/test/doubles/null_display_changer.h	2016-12-23 15:34:22 +0000
@@ -39,6 +39,9 @@
      void configure(std::shared_ptr<frontend::Session> const&, std::shared_ptr<graphics::DisplayConfiguration> const&) override
+     {
+     }
++    void remove_session_configuration(std::shared_ptr<frontend::Session> const&) override
++    {
++    }
      void set_base_configuration(std::shared_ptr<graphics::DisplayConfiguration> const&) override
+     {
+     }
 === modified file 'tests/include/mir/test/doubles/stub_display_server.h'
 --- tests/include/mir/test/doubles/stub_display_server.h	2016-12-21 03:07:05 +0000
 +++ tests/include/mir/test/doubles/stub_display_server.h	2016-12-23 15:34:22 +0000
@@ -66,6 +66,10 @@
          mir::protobuf::DisplayConfiguration const* /*request*/,
          mir::protobuf::DisplayConfiguration* /*response*/,
          google::protobuf::Closure* /*done*/) {}
++    void remove_session_configuration(
++        mir::protobuf::Void const* /*request*/,
++        mir::protobuf::Void* /*response*/,
++        google::protobuf::Closure* /*done*/) {}
      void set_base_display_configuration(
          mir::protobuf::DisplayConfiguration const* /*request*/,
          mir::protobuf::Void* /*response*/,
 === modified file 'tests/mir_test/display_config_matchers.cpp'
 --- tests/mir_test/display_config_matchers.cpp	2016-12-09 02:54:31 +0000
 +++ tests/mir_test/display_config_matchers.cpp	2016-12-23 15:34:22 +0000
@@ -423,3 +423,12 @@
      TestDisplayConfiguration translated_config_two{config2};
      return compare_display_configurations(listener, translated_config_one, translated_config_two);
+ }
++
++bool mt::compare_display_configurations(
++    testing::MatchResultListener* listener,
++    std::shared_ptr<mg::DisplayConfiguration> const& config1,
++    MirDisplayConfig const* config2)
++{
++    TestDisplayConfiguration translated_config_two{config2};
++    return compare_display_configurations(listener, *config1, translated_config_two);
++}
 === modified file 'tests/unit-tests/scene/test_mediating_display_changer.cpp'
 --- tests/unit-tests/scene/test_mediating_display_changer.cpp	2016-12-09 02:54:31 +0000
 +++ tests/unit-tests/scene/test_mediating_display_changer.cpp	2016-12-23 15:34:22 +0000
@@ -174,6 +174,10 @@
      void initial_configuration(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
      void configuration_applied(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
      void base_configuration_updated(std::shared_ptr<mg::DisplayConfiguration const> const&) override {}
++    void session_configuration_applied(
++        std::shared_ptr<mf::Session> const&,
++        std::shared_ptr<mg::DisplayConfiguration> const&) override {};
++    void session_configuration_removed(std::shared_ptr<mf::Session> const&) override {};
      void configuration_failed(
          std::shared_ptr<mg::DisplayConfiguration const> const&,
          std::exception const&) override {}