Mir

Merge lp://staging/~vanvugt/mir/fix-1408906 into lp://staging/mir

  1. fix-1408906
  2. Merge into development-branch
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
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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2214
http://jenkins.qa.ubuntu.com/job/mir-ci/2605/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/745
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/602/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/745
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3874
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16966

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2605/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

pre-existing, but for some android driver versions we can't seperate flip() from the gl rendering (and won't really have an accurate time)

okay by me, pre-existing nit:
39 + virtual void rendered_frame(SubCompositorId id = 0) = 0;
40 + virtual void finished_frame(SubCompositorId id = 0) = 0;
default parameters
http://unity.ubuntu.com/mir/cppguide/index.html?showone=Default_Arguments#Default_Arguments

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2215
http://jenkins.qa.ubuntu.com/job/mir-ci/2614/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/611
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/611/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/756
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/756/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3885
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16987

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2614/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

211 - )
212 + )

Seems an odd whitespace change.

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

OK.

We should make it more clear in the log output that the "ms/frame" value applies to rendering only, though, e.g., by changing "NNN ms/frame" to "rendering NNN ms/frame".

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

That odd whitespace change was just a copy/paste mistake. Although now I look at the whole file, that makes it completely consistent now(!?). So we can fix them all another day...

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1002/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/814
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/776
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/182/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/776
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/776/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3901
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17019

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Interesting Jenkins always needs fixing due to new bugs on a regular basis...

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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