Merge lp://staging/~robertcarr/mir/socket-messenger-reporting into lp://staging/~vanvugt/mir/fix-1226139
Proposed by
Robert Carr
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~robertcarr/mir/socket-messenger-reporting |
| Merge into: | lp://staging/~vanvugt/mir/fix-1226139 |
| Diff against target: |
12829 lines (+7770/-1040) 172 files modified
3rd_party/android-deps/android/input.h (+0/-21) 3rd_party/android-deps/std/PropertyMap.h (+14/-4) 3rd_party/android-deps/std/Vector.h (+1/-1) 3rd_party/android-input/README (+0/-19) 3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp (+2/-1) 3rd_party/android-input/android/frameworks/base/services/input/InputReader.h (+0/-4) CMakeLists.txt (+1/-1) debian/changelog (+109/-0) debian/control (+4/-4) debian/libmirclient3.install (+1/-1) debian/libmirserver4.install (+1/-1) debian/rules (+1/-2) doc/debug_for_xmir.md (+1/-1) examples/basic_server.cpp (+39/-4) examples/demo-shell/demo_shell.cpp (+2/-0) examples/demo-shell/window_manager.cpp (+51/-5) examples/demo-shell/window_manager.h (+13/-0) examples/demo_client_display_config.c (+90/-20) examples/render_surfaces.cpp (+5/-4) examples/server_configuration.cpp (+4/-4) include/platform/mir/graphics/display_buffer.h (+1/-0) include/platform/mir/graphics/display_configuration.h (+4/-1) include/server/mir/default_pause_resume_listener.h (+40/-0) include/server/mir/default_server_configuration.h (+15/-3) include/server/mir/frontend/connector.h (+14/-14) include/server/mir/frontend/connector_report.h (+9/-10) include/server/mir/frontend/display_changer.h (+1/-0) include/server/mir/frontend/messenger_report.h (+49/-0) include/server/mir/frontend/protobuf_ipc_factory.h (+3/-1) include/server/mir/frontend/session_creator.h (+44/-0) include/server/mir/frontend/session_mediator_report.h (+4/-0) include/server/mir/logging/messenger_report.h (+49/-0) include/server/mir/logging/session_mediator_report.h (+2/-0) include/server/mir/pause_resume_listener.h (+40/-0) include/server/mir/server_configuration.h (+4/-2) include/server/mir/shell/mediating_display_changer.h (+2/-0) include/server/mir/shell/unauthorized_display_changer.h (+2/-0) include/shared/mir/graphics/android/syncfence.h (+2/-19) include/shared/mir_toolkit/client_types.h (+4/-1) include/shared/mir_toolkit/common.h (+8/-0) include/test/mir_test/test_protobuf_server.h (+4/-4) include/test/mir_test_doubles/mock_display_changer.h (+1/-0) include/test/mir_test_doubles/mock_display_support_provider.h (+1/-0) include/test/mir_test_doubles/mock_hwc_interface.h (+1/-0) include/test/mir_test_doubles/mock_hwc_layerlist.h (+6/-6) include/test/mir_test_doubles/mock_pause_resume_listener.h (+44/-0) include/test/mir_test_doubles/null_display_changer.h (+3/-0) include/test/mir_test_doubles/null_display_config.h (+0/-51) include/test/mir_test_doubles/null_display_configuration.h (+1/-1) include/test/mir_test_doubles/stub_display_configuration.h (+4/-3) include/test/mir_test_doubles/stub_display_support_provider.h (+45/-0) include/test/mir_test_doubles/stub_ipc_factory.h (+6/-1) include/test/mir_test_framework/cross_process_sync.h (+5/-4) src/client/CMakeLists.txt (+1/-1) src/client/display_configuration.cpp (+1/-0) src/client/mir_connection.cpp (+1/-0) src/client/rpc/make_socket_rpc_channel.cpp (+24/-1) src/client/rpc/mir_socket_rpc_channel.cpp (+24/-4) src/client/rpc/mir_socket_rpc_channel.h (+8/-1) src/platform/graphics/default_display_configuration_policy.cpp (+4/-2) src/server/CMakeLists.txt (+1/-1) src/server/compositor/default_display_buffer_compositor.cpp (+2/-12) src/server/default_server_configuration.cpp (+44/-3) src/server/display_server.cpp (+16/-9) src/server/frontend/CMakeLists.txt (+7/-7) src/server/frontend/default_configuration.cpp (+49/-21) src/server/frontend/null_messenger_report.cpp (+25/-0) src/server/frontend/null_session_mediator_report.cpp (+4/-0) src/server/frontend/protobuf_buffer_packer.cpp (+1/-0) src/server/frontend/protobuf_session_creator.cpp (+73/-0) src/server/frontend/protobuf_session_creator.h (+60/-0) src/server/frontend/published_socket_connector.cpp (+79/-76) src/server/frontend/published_socket_connector.h (+37/-38) src/server/frontend/session_mediator.cpp (+9/-1) src/server/frontend/socket_messenger.cpp (+13/-10) src/server/frontend/socket_messenger.h (+6/-1) src/server/graphics/android/CMakeLists.txt (+1/-0) src/server/graphics/android/android_display.cpp (+16/-42) src/server/graphics/android/android_display.h (+6/-0) src/server/graphics/android/android_display_allocator.cpp (+5/-2) src/server/graphics/android/android_display_allocator.h (+1/-0) src/server/graphics/android/android_display_configuration.cpp (+68/-0) src/server/graphics/android/android_display_configuration.h (+51/-0) src/server/graphics/android/android_display_factory.cpp (+1/-1) src/server/graphics/android/android_hwc_factory.cpp (+1/-1) src/server/graphics/android/display_allocator.h (+3/-0) src/server/graphics/android/display_support_provider.h (+2/-0) src/server/graphics/android/fb_device.cpp (+6/-0) src/server/graphics/android/fb_device.h (+2/-0) src/server/graphics/android/gpu_hwc_android_display_buffer_factory.cpp (+5/-2) src/server/graphics/android/hwc10_device.cpp (+2/-0) src/server/graphics/android/hwc10_device.h (+0/-1) src/server/graphics/android/hwc11_device.cpp (+23/-38) src/server/graphics/android/hwc11_device.h (+3/-4) src/server/graphics/android/hwc_common_device.cpp (+28/-1) src/server/graphics/android/hwc_common_device.h (+12/-0) src/server/graphics/android/hwc_device.h (+2/-0) src/server/graphics/android/hwc_layerlist.cpp (+46/-23) src/server/graphics/android/hwc_layerlist.h (+18/-14) src/server/graphics/android/internal_client.cpp (+3/-4) src/server/graphics/android/internal_client.h (+2/-1) src/server/graphics/android/internal_client_window.cpp (+2/-1) src/server/graphics/android/server_render_window.cpp (+2/-1) src/server/graphics/gbm/gbm_buffer_allocator.cpp (+5/-1) src/server/graphics/gbm/gbm_buffer_allocator.h (+2/-0) src/server/graphics/gbm/gbm_display.cpp (+42/-6) src/server/graphics/gbm/gbm_display.h (+2/-0) src/server/graphics/gbm/gbm_display_buffer.h (+0/-1) src/server/graphics/gbm/kms_output.h (+5/-0) src/server/graphics/gbm/real_kms_display_configuration.cpp (+5/-3) src/server/graphics/gbm/real_kms_display_configuration.h (+1/-1) src/server/graphics/gbm/real_kms_output.cpp (+72/-7) src/server/graphics/gbm/real_kms_output.h (+9/-0) src/server/graphics/nested/nested_display_configuration.cpp (+8/-2) src/server/graphics/nested/nested_display_configuration.h (+2/-1) src/server/logging/CMakeLists.txt (+1/-0) src/server/logging/messenger_report.cpp (+46/-0) src/server/logging/session_mediator_report.cpp (+5/-0) src/server/options/program_option.cpp (+1/-1) src/server/shell/mediating_display_changer.cpp (+27/-0) src/server/shell/unauthorized_display_changer.cpp (+5/-0) src/shared/graphics/android/mir_native_window.cpp (+3/-19) src/shared/graphics/android/syncfence.cpp (+16/-6) src/shared/protobuf/mir_protobuf.proto (+1/-0) tests/acceptance-tests/test_client_input.cpp (+9/-6) tests/acceptance-tests/test_client_library.cpp (+1/-1) tests/acceptance-tests/test_server_shutdown.cpp (+3/-3) tests/acceptance-tests/test_test_framework.cpp (+1/-1) tests/integration-tests/client/test_client_render.cpp (+1/-1) tests/integration-tests/graphics/android/test_display_integration.cpp (+5/-7) tests/integration-tests/shell/test_session.cpp (+5/-4) tests/integration-tests/test_display_server_main_loop_events.cpp (+132/-32) tests/integration-tests/test_error_reporting.cpp (+1/-1) tests/mir_test/display_config_matchers.cpp (+5/-3) tests/mir_test_doubles/test_protobuf_socket_server.cpp (+10/-10) tests/mir_test_framework/cross_process_sync.cpp (+10/-0) tests/mir_test_framework/input_testing_server_options.cpp (+1/-1) tests/mir_test_framework/testing_process_manager.cpp (+1/-1) tests/mir_test_framework/testing_server_options.cpp (+1/-1) tests/unit-tests/android_input/CMakeLists.txt (+1/-0) tests/unit-tests/android_input/input_reader.cpp (+5135/-0) tests/unit-tests/client/android/CMakeLists.txt (+0/-1) tests/unit-tests/client/android/test_android_syncfence.cpp (+0/-91) tests/unit-tests/client/test_client_mir_surface.cpp (+1/-1) tests/unit-tests/frontend/CMakeLists.txt (+1/-1) tests/unit-tests/frontend/stress_protobuf_communicator.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 (+89/-32) tests/unit-tests/frontend/test_session_mediator.cpp (+5/-3) tests/unit-tests/frontend/test_socket_messenger.cpp (+5/-2) tests/unit-tests/graphics/android/test_android_display_factory.cpp (+6/-5) tests/unit-tests/graphics/android/test_android_fb.cpp (+5/-14) tests/unit-tests/graphics/android/test_gpu_display.cpp (+2/-1) tests/unit-tests/graphics/android/test_hwc10_device.cpp (+0/-1) tests/unit-tests/graphics/android/test_hwc11_device.cpp (+45/-120) tests/unit-tests/graphics/android/test_hwc_device.cpp (+36/-17) tests/unit-tests/graphics/android/test_hwc_display.cpp (+56/-3) tests/unit-tests/graphics/android/test_hwc_layerlist.cpp (+26/-24) tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp (+12/-3) tests/unit-tests/graphics/android/test_server_interpreter.cpp (+1/-1) tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp (+64/-0) tests/unit-tests/graphics/gbm/test_gbm_cursor.cpp (+8/-3) tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp (+15/-7) tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp (+141/-23) tests/unit-tests/graphics/gbm/test_overlapping_output_grouping.cpp (+3/-2) tests/unit-tests/graphics/gbm/test_real_kms_output.cpp (+59/-0) tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp (+15/-10) tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+30/-8) tests/unit-tests/graphics/test_display.cpp (+2/-0) tests/unit-tests/graphics/test_display_configuration.cpp (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~robertcarr/mir/socket-messenger-reporting |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alan Griffiths (community) | Needs Fixing | ||
| Daniel van Vugt | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2013-09-26.
Commit message
Report exceptions in socket messenger.
Description of the change
Report socket messenger write errors so we can keep track of this.
To post a comment you must log in.
Revision history for this message
| Robert Carr (robertcarr) wrote | # |
Unmerged revisions
- 1077. By Robert Carr
-
Merge development branch
- 1076. By Robert Carr
-
Update tests
- 1075. By Robert Carr
-
Merge trunk and update to new frontend interfaces
- 1074. By Robert Carr
-
Typo
- 1073. By Robert Carr
-
socket_messenger: Report exceptions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
[ try]
9 {
50 ba::write(*socket, ba::buffer(
51 }
52 - catch (std::exception &)
53 + catch (std::exception &ex)
54 {
55 - // Don't care
56 + report->error(ex);
57 }
This is better written as:
boost:
ba:
if (!ec)
{
}
And not throwing and catching exceptions.