Mir

unit-tests SwitchingBundleTest takes too long for a unit test

Bug #1210478 reported by Alan Griffiths
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Mir
Fix Released
Medium
Daniel van Vugt
Mir 0.0.11
mir (Ubuntu)
Fix Released
Undecided
Unassigned

Bug Description

$ bin/unit-tests --gtest_filter=-SwitchingBundleTest* | grep ====
[==========] Running 492 tests from 106 test cases.
[==========] 492 tests from 106 test cases ran. (791 ms total)
$ bin/unit-tests --gtest_filter=SwitchingBundleTest* | grep ====
[==========] Running 21 tests from 1 test case.
[==========] 21 tests from 1 test case ran. (16381 ms total)

This is because the code under test, and the test itself accesses the high resolution clock directly instead of using TimeSource and mocks.

Related branches

lp:~vanvugt/mir/timerless-multimonitor-frame-sync
PS Jenkins bot (community): Approve (continuous-integration)
Robert Ancell: Approve
Alan Griffiths: Approve
Diff: 1180 lines (+176/-173)
33 files modified
include/server/mir/compositor/buffer_stream_surfaces.h (+2/-1)
include/server/mir/compositor/renderer.h (+1/-1)
include/server/mir/surfaces/buffer_stream.h (+2/-1)
include/test/mir_test_doubles/mock_buffer_bundle.h (+1/-1)
include/test/mir_test_doubles/mock_buffer_stream.h (+2/-1)
include/test/mir_test_doubles/mock_surface_renderer.h (+1/-1)
include/test/mir_test_doubles/stub_buffer_stream.h (+1/-1)
src/server/compositor/buffer_bundle.h (+2/-1)
src/server/compositor/buffer_stream_surfaces.cpp (+4/-2)
src/server/compositor/default_display_buffer_compositor.cpp (+28/-3)
src/server/compositor/default_display_buffer_compositor.h (+2/-0)
src/server/compositor/gl_renderer.cpp (+4/-2)
src/server/compositor/gl_renderer.h (+3/-1)
src/server/compositor/switching_bundle.cpp (+5/-7)
src/server/compositor/switching_bundle.h (+3/-6)
src/server/compositor/temporary_buffers.cpp (+2/-2)
src/server/compositor/temporary_buffers.h (+1/-1)
src/server/surfaces/surface.cpp (+1/-1)
tests/acceptance-tests/test_server_shutdown.cpp (+1/-1)
tests/integration-tests/compositor/test_buffer_stream.cpp (+15/-21)
tests/integration-tests/compositor/test_swapping_swappers.cpp (+4/-2)
tests/integration-tests/shell/test_session.cpp (+2/-2)
tests/integration-tests/test_surface_first_frame_sync.cpp (+1/-1)
tests/integration-tests/test_swapinterval.cpp (+1/-1)
tests/mir_test_framework/testing_server_options.cpp (+2/-2)
tests/unit-tests/compositor/test_buffer_stream.cpp (+4/-4)
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+8/-8)
tests/unit-tests/compositor/test_gl_renderer.cpp (+1/-1)
tests/unit-tests/compositor/test_rendering_operator.cpp (+1/-1)
tests/unit-tests/compositor/test_switching_bundle.cpp (+65/-91)
tests/unit-tests/compositor/test_temporary_buffers.cpp (+3/-3)
tests/unit-tests/surfaces/test_surface.cpp (+1/-1)
tests/unit-tests/surfaces/test_surface_stack.cpp (+2/-1)
lp:~vanvugt/mir/timerless-multimonitor-frame-sync-without-bypass
Rejected for merging into lp:~mir-team/mir/trunk
Alan Griffiths: Needs Fixing
PS Jenkins bot (community): Approve (continuous-integration)
Diff: 1100 lines (+162/-165)
33 files modified
include/server/mir/compositor/buffer_stream_surfaces.h (+2/-1)
include/server/mir/compositor/renderer.h (+1/-1)
include/server/mir/surfaces/buffer_stream.h (+2/-1)
include/test/mir_test_doubles/mock_buffer_bundle.h (+1/-1)
include/test/mir_test_doubles/mock_buffer_stream.h (+2/-1)
include/test/mir_test_doubles/mock_surface_renderer.h (+1/-1)
include/test/mir_test_doubles/stub_buffer_stream.h (+1/-1)
src/server/compositor/buffer_bundle.h (+2/-1)
src/server/compositor/buffer_stream_surfaces.cpp (+4/-2)
src/server/compositor/default_display_buffer_compositor.cpp (+21/-2)
src/server/compositor/default_display_buffer_compositor.h (+2/-0)
src/server/compositor/gl_renderer.cpp (+4/-2)
src/server/compositor/gl_renderer.h (+3/-1)
src/server/compositor/switching_bundle.cpp (+5/-7)
src/server/compositor/switching_bundle.h (+3/-6)
src/server/compositor/temporary_buffers.cpp (+2/-2)
src/server/compositor/temporary_buffers.h (+1/-1)
src/server/surfaces/surface.cpp (+1/-1)
tests/acceptance-tests/test_server_shutdown.cpp (+1/-1)
tests/integration-tests/compositor/test_buffer_stream.cpp (+15/-21)
tests/integration-tests/compositor/test_swapping_swappers.cpp (+4/-2)
tests/integration-tests/shell/test_session.cpp (+2/-2)
tests/integration-tests/test_surface_first_frame_sync.cpp (+1/-1)
tests/integration-tests/test_swapinterval.cpp (+1/-1)
tests/mir_test_framework/testing_server_options.cpp (+2/-2)
tests/unit-tests/compositor/test_buffer_stream.cpp (+4/-4)
tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+1/-1)
tests/unit-tests/compositor/test_gl_renderer.cpp (+1/-1)
tests/unit-tests/compositor/test_rendering_operator.cpp (+1/-1)
tests/unit-tests/compositor/test_switching_bundle.cpp (+65/-91)
tests/unit-tests/compositor/test_temporary_buffers.cpp (+3/-3)
tests/unit-tests/surfaces/test_surface.cpp (+1/-1)
tests/unit-tests/surfaces/test_surface_stack.cpp (+2/-1)
lp:ubuntu/saucy-proposed/mir
Robert Ancell (robert-ancell)
Changed in mir:
status: New → Triaged
importance: Undecided → Medium
Daniel van Vugt (vanvugt)
Changed in mir:
assignee: nobody → Daniel van Vugt (vanvugt)
status: Triaged → In Progress
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

Fix committed into lp:mir at revision None, scheduled for release in mir, milestone 0.0.11

Changed in mir:
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package mir - 0.0.10+13.10.20130903-0ubuntu1

---------------
mir (0.0.10+13.10.20130903-0ubuntu1) saucy; urgency=low

  [ Daniel van Vugt ]
  * SwitchingBundle: Simplify and clarify guarantees that
    compositor_acquire always has a buffer to return without blocking or
    throwing an exception. The trade-off is that to enforce the
    guarantee we need to permanently reserve one buffer for compositing.
    This reduces the flexibility of SwitchingBundle a little, such that
    minimum nbuffers is now 2. This was originally requested by
    Alexandros, as the potential throw concerned him. Although, it was
    logically guaranteed to never happen for other reasons. The second
    reason for doing this is to eliminate recycling logic, which while
    safe and correct, was quite confusing. So this change further proves
    that that logic (now removed) is not to blame for frame ordering
    bugs. .

  [ Christopher James Halse Rogers ]
  * Synthesise an unfocused event on destruction of a focused window We
    probably need to rethink focus entirely, but this is an incremental
    improvement that I need.

  [ Ubuntu daily release ]
  * Automatic snapshot from revision 1049
 -- Ubuntu daily release <email address hidden> Tue, 03 Sep 2013 14:04:56 +0000

Changed in mir (Ubuntu):
status: New → Fix Released
Robert Ancell (robert-ancell)
Changed in mir:
milestone: none → 0.0.11
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.