Merge lp:~vanvugt/mir/lock-default_stream-changes into lp:mir

[Daniel van Vugt]

Add missing locking for when MirSurface replaces its default_stream.
Also add a related comment.

[Mir CI Bot (mir-ci-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Bug 1523621

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3884
https://mir-jenkins.ubuntu.com/job/mir-ci/2404/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3132/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3199
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3191
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3191
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3191
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3161/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3161/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3161/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3161/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3161/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3161/console

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

alright to this MP, curious though as to why the client has to know about the mappings though. FWIW, I think it would be better if the client did get a notification about the server accepting its modifications.

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2016-12-13 06:00:32 +0000
+++ src/client/mir_surface.cpp	2016-12-15 09:57:53 +0000
@@ -609,7 +609,17 @@
 
     if (spec.streams.is_set())
     {
-        default_stream = nullptr;
+        /*
+         * Note that we don't check for errors from modify_surface. So in
+         * updating default_stream here, we're just assuming it will succeed.
+         * Seems to be a harmless assumption to have made so far and much
+         * simpler than communicating back suceessful mappings from the server,
+         * but there is a prototype started for that: lp:~vanvugt/mir/adoption
+         */
+        {
+            std::lock_guard<decltype(mutex)> lock(mutex);
+            default_stream = nullptr;
+        }
         for(auto const& stream : spec.streams.value())
         {
             auto const new_stream = surface_specification->add_stream();