Merge lp:~alan-griffiths/mir/no-unbounded-multimaps into lp:mir

[Alan Griffiths]

mf::SessionMediator: Prevent stream_associated_buffers from growing without bound

Chris spotted this issue in: lp:~raof/mir/no-unbounded-multimaps/+merge/329174, but I think this is a better solution.

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

PASSED: Continuous integration, rev:4231
https://mir-jenkins.ubuntu.com/job/mir-ci/3559/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4877
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5092
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5081
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5081
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5081
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4914/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4914/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4914/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4914/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4914/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4914/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/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4914/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4914
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4914/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

This modifies the wrong codepath; this will dissociate *every* buffer associated with a stream the first time *any* buffer associated with a stream is released, and won't disassociate buffers from streams that get released.

review: Disapprove

Unmerged revisions

4231. By Alan Griffiths on 2017-08-17

mf::SessionMediator: Prevent stream_associated_buffers from growing without bound.

=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2017-08-16 06:40:10 +0000
+++ src/server/frontend/session_mediator.cpp	2017-08-17 09:58:07 +0000
@@ -572,20 +572,9 @@
 
     if (request->has_id())
     {
-        auto const stream_id = mf::BufferStreamId{request->id().value()};
-
-        auto const associated_range = stream_associated_buffers.equal_range(stream_id);
-        for (auto match = associated_range.first; match != associated_range.second;)
-        {
-            auto const current = match;
-            ++match;
-            if (std::find(to_release.begin(), to_release.end(), current->second) != to_release.end())
-            {
-
-                stream_associated_buffers.erase(current);
-            }
-        }
+        stream_associated_buffers.erase(mf::BufferStreamId{request->id().value()});
     }
+
     for (auto const& buffer_id : to_release)
     {
         buffer_cache.erase(buffer_id);