Merge lp://staging/~vanvugt/mir/fix-1408906 into lp://staging/mir
Proposed by
Daniel van Vugt
Status: | Merged |
---|---|
Approved by: | Daniel van Vugt |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2212 |
Proposed branch: | lp://staging/~vanvugt/mir/fix-1408906 |
Merge into: | lp://staging/mir |
Diff against target: |
412 lines (+124/-37) 13 files modified
playground/demo-shell/demo_compositor.cpp (+3/-2) src/include/server/mir/compositor/compositor_report.h (+2/-1) src/server/compositor/default_display_buffer_compositor.cpp (+3/-2) src/server/report/logging/compositor_report.cpp (+14/-7) src/server/report/logging/compositor_report.h (+3/-1) src/server/report/lttng/compositor_report.cpp (+8/-3) src/server/report/lttng/compositor_report.h (+2/-1) src/server/report/lttng/compositor_report_tp.h (+11/-3) src/server/report/null/compositor_report.cpp (+5/-1) src/server/report/null/compositor_report.h (+2/-1) tests/include/mir_test_doubles/mock_compositor_report.h (+4/-2) tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+33/-5) tests/unit-tests/logging/test_compositor_report.cpp (+34/-8) |
To merge this branch: | bzr merge lp://staging/~vanvugt/mir/fix-1408906 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Alexandros Frantzis (community) | Approve | ||
Alan Griffiths | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email: mp+245934@code.staging.launchpad.net |
Commit message
CompositorReport: Ensure bypass reports zero render time instead of the
frame time (LP: #1408906).
Also clean up the reporting interface so it makes more sense.
To post a comment you must log in.
FAILED: Continuous integration, rev:2214 jenkins. qa.ubuntu. com/job/ mir-ci/ 2605/ jenkins. qa.ubuntu. com/job/ mir-android- vivid-i386- build/783 jenkins. qa.ubuntu. com/job/ mir-clang- vivid-amd64- build/783 jenkins. qa.ubuntu. com/job/ mir-mediumtests -vivid- touch/745 jenkins. qa.ubuntu. com/job/ mir-vivid- amd64-ci/ 602/console jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 745 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- vivid-armhf/ 745/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/3874 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 16966
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- ci/2605/ rebuild
http://