Merge lp:~vanvugt/mir/judder into lp:mir
Status: | Work in progress |
---|---|
Proposed branch: | lp:~vanvugt/mir/judder |
Merge into: | lp:mir |
Diff against target: |
297 lines (+166/-35) 3 files modified
src/server/compositor/multi_threaded_compositor.cpp (+29/-26) tests/acceptance-tests/test_client_surface_swap_buffers.cpp (+3/-4) tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+134/-5) |
To merge this branch: | bzr merge lp:~vanvugt/mir/judder |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Alexandros Frantzis | Pending | ||
Alan Griffiths | Pending | ||
Mir development team | Pending | ||
Review via email: mp+221276@code.launchpad.net |
Commit message
Fix frame skipping/
that fake frames don't occur if real frames are being composited.
This also modifies minimum buffer consumption to drop to 10Hz if compositors
block, ensuring clients always get their frames consumed in a definite time.
And it also happens to solve LP: #1308844.
Unmerged revisions
- 1587. By Daniel van Vugt
-
Merge latest development-branch
- 1586. By Daniel van Vugt
-
Merge latest development-branch
- 1585. By Daniel van Vugt
-
Adjust sleep to yield 10Hz client wakeups
- 1584. By Daniel van Vugt
-
Tidy up
- 1583. By Daniel van Vugt
-
Fix missing brace, FTBFS
- 1582. By Daniel van Vugt
-
Merge latest development-branch
- 1581. By Daniel van Vugt
-
Clean up
- 1580. By Daniel van Vugt
-
Remember to set the continuation flag correctly... even on frames when
we're not consuming frames. - 1579. By Daniel van Vugt
-
Remember to keep fake compositing as required
- 1578. By Daniel van Vugt
-
Remove more tabs
FAILED: Continuous integration, rev:1585 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/1758/ jenkins. qa.ubuntu. com/job/ mir-android- utopic- i386-build/ 375 jenkins. qa.ubuntu. com/job/ mir-clang- utopic- amd64-build/ 376 jenkins. qa.ubuntu. com/job/ mir-mediumtests -utopic- touch/373/ console jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- amd64-ci/ 277 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- amd64-ci/ 277/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- armhf-ci/ 276 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- armhf-ci/ 276/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1037 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1037/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/1602/ console s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 7850
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- team-mir- development- branch- ci/1758/ rebuild
http://