Merge lp://qastaging/~robertcarr/mir/fix-1227683 into lp://qastaging/mir/0.1
Proposed by
Robert Carr
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~robertcarr/mir/fix-1227683 |
| Merge into: | lp://qastaging/mir/0.1 |
| Diff against target: |
4407 lines (+1372/-678) 130 files modified
doc/component_reports.md (+2/-0) examples/render_surfaces.cpp (+2/-0) examples/render_to_fb.cpp (+1/-4) include/client/mir_toolkit/mir_client_library_drm.h (+14/-0) include/server/mir/compositor/buffer_stream.h (+5/-5) include/server/mir/compositor/default_display_buffer_compositor_factory.h (+2/-0) include/server/mir/compositor/scene.h (+2/-5) include/server/mir/default_configuration_options.h (+2/-0) include/server/mir/default_server_configuration.h (+5/-0) include/server/mir/shell/session.h (+1/-0) include/server/mir/surfaces/buffer_stream_factory.h (+3/-4) include/server/mir/surfaces/surface.h (+8/-5) include/server/mir/surfaces/surface_controller.h (+1/-1) include/server/mir/surfaces/surfaces_report.h (+60/-0) include/test/mir_test/draw/android_graphics.h (+1/-1) include/test/mir_test_doubles/mock_buffer_stream.h (+2/-2) include/test/mir_test_doubles/mock_shell_session.h (+2/-0) include/test/mir_test_doubles/mock_surface_renderer.h (+4/-3) include/test/mir_test_doubles/stub_buffer_stream.h (+2/-2) include/test/mir_test_doubles/stub_ipc_factory.h (+2/-2) include/test/mir_test_doubles/stub_shell_session.h (+4/-0) include/test/mir_test_doubles/stub_surface_builder.h (+8/-2) src/client/mir_client_library.cpp (+29/-8) src/client/mir_connection.cpp (+16/-0) src/client/mir_connection.h (+4/-0) src/platform/graphics/CMakeLists.txt (+0/-1) src/server/CMakeLists.txt (+1/-0) src/server/compositor/CMakeLists.txt (+1/-0) src/server/compositor/buffer_stream_factory.cpp (+3/-3) src/server/compositor/buffer_stream_factory.h (+1/-1) src/server/compositor/buffer_stream_surfaces.cpp (+1/-1) src/server/compositor/buffer_stream_surfaces.h (+2/-2) src/server/compositor/bypass.cpp (+2/-2) src/server/compositor/bypass.h (+3/-3) src/server/compositor/default_configuration.cpp (+85/-0) src/server/compositor/default_display_buffer_compositor.cpp (+3/-3) src/server/compositor/default_display_buffer_compositor_factory.cpp (+2/-2) src/server/compositor/gl_renderer.cpp (+2/-2) src/server/compositor/gl_renderer.h (+2/-2) src/server/compositor/gl_renderer_factory.cpp (+1/-1) src/server/compositor/gl_renderer_factory.h (+1/-1) src/server/compositor/multi_threaded_compositor.cpp (+1/-1) src/server/compositor/occlusion.cpp (+1/-1) src/server/compositor/occlusion.h (+1/-1) src/server/compositor/renderer.h (+2/-5) src/server/compositor/rendering_operator.cpp (+2/-3) src/server/compositor/rendering_operator.h (+2/-2) src/server/default_configuration_options.cpp (+6/-0) src/server/default_server_configuration.cpp (+3/-399) src/server/frontend/default_configuration.cpp (+99/-2) src/server/frontend/global_event_sender.cpp (+1/-1) src/server/frontend/global_event_sender.h (+1/-1) src/server/frontend/protobuf_message_processor.cpp (+1/-1) src/server/frontend/protobuf_session_creator.cpp (+1/-1) src/server/frontend/resource_cache.cpp (+1/-1) src/server/frontend/session_mediator.cpp (+3/-3) src/server/frontend/session_mediator_android.cpp (+1/-1) src/server/frontend/session_mediator_gbm.cpp (+1/-1) src/server/graphics/CMakeLists.txt (+7/-0) src/server/graphics/default_configuration.cpp (+147/-0) src/server/graphics/default_display_configuration_policy.cpp (+6/-6) src/server/graphics/default_display_configuration_policy.h (+3/-6) src/server/graphics/nested/host_connection.cpp (+3/-3) src/server/graphics/nested/host_connection.h (+1/-1) src/server/graphics/nested/nested_display.cpp (+1/-1) src/server/graphics/nested/nested_platform.cpp (+2/-2) src/server/graphics/nested/nested_platform.h (+1/-1) src/server/logging/CMakeLists.txt (+2/-0) src/server/logging/connector_report.cpp (+1/-1) src/server/logging/default_configuration.cpp (+112/-0) src/server/logging/display_report.cpp (+1/-1) src/server/logging/session_mediator_report.cpp (+1/-1) src/server/logging/surfaces_report.cpp (+119/-0) src/server/logging/surfaces_report.h (+56/-0) src/server/surfaces/CMakeLists.txt (+2/-0) src/server/surfaces/default_configuration.cpp (+99/-0) src/server/surfaces/surface.cpp (+14/-8) src/server/surfaces/surface_allocator.cpp (+8/-6) src/server/surfaces/surface_allocator.h (+5/-2) src/server/surfaces/surface_controller.cpp (+1/-1) src/server/surfaces/surface_stack.cpp (+21/-11) src/server/surfaces/surface_stack.h (+6/-2) src/server/surfaces/surfaces_report.cpp (+27/-0) tests/acceptance-tests/CMakeLists.txt (+1/-0) tests/acceptance-tests/test_client_input.cpp (+2/-2) tests/acceptance-tests/test_client_library_drm.cpp (+59/-0) tests/acceptance-tests/test_display_configuration.cpp (+1/-1) tests/acceptance-tests/test_server_shutdown.cpp (+3/-3) tests/acceptance-tests/test_surfaces_with_output_id.cpp (+1/-1) tests/integration-tests/compositor/test_buffer_stream.cpp (+4/-5) tests/integration-tests/compositor/test_swapping_swappers.cpp (+1/-1) tests/integration-tests/graphics/android/test_internal_client.cpp (+7/-5) tests/integration-tests/graphics/gbm/test_buffer_integration.cpp (+1/-1) tests/integration-tests/shell/test_session.cpp (+4/-4) tests/integration-tests/shell/test_session_manager.cpp (+1/-1) tests/integration-tests/test_display_info.cpp (+4/-4) tests/integration-tests/test_error_reporting.cpp (+2/-2) tests/integration-tests/test_surface_first_frame_sync.cpp (+3/-3) tests/integration-tests/test_swapinterval.cpp (+4/-4) tests/mir_test_framework/testing_server_options.cpp (+3/-3) tests/unit-tests/client/test_client_mir_surface.cpp (+1/-1) tests/unit-tests/client/test_mir_connection.cpp (+48/-1) tests/unit-tests/compositor/test_buffer_stream.cpp (+1/-2) tests/unit-tests/compositor/test_default_display_buffer_compositor.cpp (+4/-4) tests/unit-tests/compositor/test_gl_renderer.cpp (+3/-3) tests/unit-tests/compositor/test_multi_threaded_compositor.cpp (+1/-1) tests/unit-tests/compositor/test_rendering_operator.cpp (+2/-3) tests/unit-tests/frontend/stress_protobuf_communicator.cpp (+1/-1) tests/unit-tests/frontend/test_global_event_sender.cpp (+1/-1) tests/unit-tests/frontend/test_protobuf_reports_errors.cpp (+1/-1) tests/unit-tests/frontend/test_protobuf_sends_fds.cpp (+1/-1) tests/unit-tests/frontend/test_protobuf_surface_apis.cpp (+1/-1) tests/unit-tests/frontend/test_published_socket_connector.cpp (+1/-1) tests/unit-tests/frontend/test_resource_cache.cpp (+1/-1) tests/unit-tests/frontend/test_session_mediator.cpp (+3/-3) tests/unit-tests/frontend/test_session_mediator_android.cpp (+2/-2) tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+2/-2) tests/unit-tests/graphics/gbm/test_gbm_display.cpp (+2/-2) tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp (+1/-1) tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp (+1/-1) tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+1/-1) tests/unit-tests/graphics/test_display.cpp (+1/-1) tests/unit-tests/input/android/test_android_input_lexicon.cpp (+14/-0) tests/unit-tests/logging/test_display_report.cpp (+1/-1) tests/unit-tests/shell/test_session_manager.cpp (+1/-1) tests/unit-tests/shell/test_surface.cpp (+8/-2) tests/unit-tests/surfaces/test_surface.cpp (+20/-18) tests/unit-tests/surfaces/test_surface_allocator.cpp (+1/-1) tests/unit-tests/surfaces/test_surface_controller.cpp (+1/-1) tests/unit-tests/surfaces/test_surface_stack.cpp (+80/-34) |
| To merge this branch: | bzr merge lp://qastaging/~robertcarr/mir/fix-1227683 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin DuBois (community) | Needs Information | ||
| Daniel van Vugt | Needs Resubmitting | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-10-30.
Commit message
test_client_
Description of the change
Started investigating bug 1227683, the hidden clients test failure.
I was able to reproduce it quite consistently today (about 3/10 valgrind runs ><). My system is quite slow today somehow, I guess exaggerating the effect.
Through use of SESSION_
Started investigating and found that the timeout fixed in this branch was still down at 2 seconds!
Bumped it to 60. Was able to run a 100 repetition run under valgrind with no failures.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:1171
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild:
http://