Mir

Merge lp:~vanvugt/mir/simplify-BufferDepository-submit into lp:mir

Proposed by Daniel van Vugt on 2017-05-02
Status: Merged
Approved by: Daniel van Vugt on 2017-05-03
Approved revision: 4160
Merged at revision: 4160
Proposed branch: lp:~vanvugt/mir/simplify-BufferDepository-submit
Merge into: lp:mir
Diff against target: 25 lines (+2/-5)
1 file modified
src/client/buffer_stream.cpp (+2/-5)
To merge this branch: bzr merge lp:~vanvugt/mir/simplify-BufferDepository-submit
Reviewer Review Type Date Requested Status
Andreas Pokorny (community) Approve on 2017-05-02
Mir CI Bot continuous-integration Approve on 2017-05-02
Mir development team 2017-05-02 Pending
Review via email: mp+323486@code.launchpad.net

Commit message

Remove dead code: Unused parameters to BufferDepository::submit()

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

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

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

review: Approve (continuous-integration)
Andreas Pokorny (andreas-pokorny) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/client/buffer_stream.cpp'
2--- src/client/buffer_stream.cpp 2017-04-13 07:00:27 +0000
3+++ src/client/buffer_stream.cpp 2017-05-02 09:21:45 +0000
4@@ -185,7 +185,7 @@
5 return current->rpc_id();
6 }
7
8- MirWaitHandle* submit(std::function<void()> const& done, MirPixelFormat, int)
9+ MirWaitHandle* submit(std::function<void()> const& done)
10 {
11 std::unique_lock<std::mutex> lk(mutex);
12 if (!current)
13@@ -389,11 +389,8 @@
14
15 secured_region.reset();
16
17- // TODO: We can fix the strange "ID casting" used below in the second phase
18- // of buffer stream which generalizes and clarifies the server side logic.
19 lock.unlock();
20- return buffer_depository->submit(done,
21- static_cast<MirPixelFormat>(protobuf_bs->pixel_format()), protobuf_bs->id().value());
22+ return buffer_depository->submit(done);
23 }
24
25 std::shared_ptr<mcl::ClientBuffer> mcl::BufferStream::get_current_buffer()

Subscribers

People subscribed via source and target branches