Merge lp:~raof/mir/fix-invalid-bufferstream-id into lp:mir

[Chris Halse Rogers]

client: Don't set BufferStreamID to an invalid value when allocating a buffer.

We have code in mf::SessionMediator to check if a BufferStreamID is set on a allocation request. This code never exectues, though, because for some reason MirConnection will always set the BufferStreamID on an allocation request.

And if there isn't a reasonable BufferStreamID to set (ie: we're allocating a buffer via mir_connection_allocate_buffer) then it sets -1, an invalid ID.

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

PASSED: Continuous integration, rev:4183
https://mir-jenkins.ubuntu.com/job/mir-ci/3412/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4640
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4772
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4761
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4761
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4672
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4672/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/4672
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4672/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4672
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4672/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4672
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4672/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/4672
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4672/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2017-05-17 04:48:46 +0000
+++ src/client/mir_connection.cpp	2017-05-25 06:40:14 +0000
@@ -1287,7 +1287,6 @@
     MirBufferCallback callback, void* context)
 {
     mp::BufferAllocation request;
-    request.mutable_id()->set_value(-1);
     auto buffer_request = request.add_buffer_requests();
     buffer_request->set_width(size.width.as_int());
     buffer_request->set_height(size.height.as_int());
 
=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2017-05-17 04:48:46 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2017-05-25 06:40:14 +0000
@@ -854,7 +854,6 @@
     auto format = mir_pixel_format_abgr_8888;
     auto usage = mir_buffer_usage_software;
     mp::BufferAllocation mp_alloc;
-    mp_alloc.mutable_id()->set_value(-1);
     auto params = mp_alloc.add_buffer_requests();
     params->set_width(size.width.as_int());
     params->set_height(size.height.as_int());