Mir

Merge lp://staging/~kdub/mir/rm-depository-from-screencast into lp://staging/mir

  1. rm-depository-from-screencast
  2. Merge into development-branch
Proposed by Kevin DuBois
Status: Work in progress
Proposed branch: lp://staging/~kdub/mir/rm-depository-from-screencast
Merge into: lp://staging/mir
Diff against target: 162 lines (+72/-11)
3 files modified
src/client/screencast_stream.cpp (+12/-9)
src/client/screencast_stream.h (+3/-2)
tests/unit-tests/client/test_screencast_stream.cpp (+57/-0)
To merge this branch: bzr merge lp://staging/~kdub/mir/rm-depository-from-screencast
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Needs Fixing
Chris Halse Rogers Approve
Mir CI Bot continuous-integration Needs Fixing
Review via email: mp+298298@code.staging.launchpad.net

Commit message

client: remove usage of BufferVault in the ScreencastStream. Disentangles ScreencastStream, preparing for BufferVault's removal once we're ready to remove that code.

This also reduces the client-side number of mapped buffers to just the current one, whereas before, we were keeping 3 around, and kicking out the oldest one as new ones arrived.

Also add a bonus test where I noticed that a wait handle could have been left hanging if an exception threw around buffer creation.

Description of the change

client: remove usage of BufferVault in the ScreencastStream. Disentangles ScreencastStream, preparing for BufferVault's removal once we're ready to remove that code.

This also reduces the client-side number of mapped buffers to just the current one, whereas before, we were keeping 3 around, and kicking out the oldest one as new ones arrived.

Also add a bonus test where I noticed that a wait handle could have been left hanging if an exception threw around buffer creation.

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

FAILED: Continuous integration, rev:3534
https://mir-jenkins.ubuntu.com/job/mir-ci/1195/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1356/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1407
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1398
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1398
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1370/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1370/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1370/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1370/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1370/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1370/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Chris Halse Rogers (raof) wrote :

Seems sensible.

review: Approve
Reply
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

On the server side we are still tracking screencast buffers and support sending mg::BufferIpcMsgType::update_msg buffer messages. The new code (i.e. without BufferDepository) doesn't seem to support this scenario.

review: Needs Fixing
Reply
Revision history for this message
Kevin DuBois (kdub) wrote :

recent changes to screencasting have us rotating through the buffers, instead of allocing a new one every time. This did work on the devices I tested with, but we might have to keep BufferVault around after all. Will take MP down to investigate

Reply

Unmerged revisions

3534. By Kevin DuBois

merge in mir

3533. By Kevin DuBois

merge in mir

3532. By Kevin DuBois

test to avoid hanging to pass

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches