← Back to branch summary

~robertcarr/mir/socket-messenger-reporting

~robertcarr/mir/socket-messenger-reporting

Viewing all changes in revision 1075.

Committer: Robert Carr
Date: 2013-09-26 15:33:10 UTC
mfrom: (1071.1.14 trunk)
Revision ID: robert.carr@canonical.com-20130926153310-dh4s2sco8isb4bck

Merge trunk and update to new frontend interfaces

files added:
include/server/mir/default_pause_resume_listener.h

include/server/mir/frontend/messenger_report.h

include/server/mir/frontend/session_creator.h

include/server/mir/logging/messenger_report.h

include/server/mir/pause_resume_listener.h

include/test/mir_test_doubles/mock_pause_resume_listener.h

include/test/mir_test_doubles/stub_display_support_provider.h

src/server/frontend/null_messenger_report.cpp

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/protobuf_session_creator.h

src/server/graphics/android/android_display_configuration.cpp

src/server/graphics/android/android_display_configuration.h

src/server/logging/messenger_report.cpp

tests/unit-tests/android_input/input_reader.cpp

files removed:
include/test/mir_test_doubles/null_display_config.h

tests/unit-tests/client/android/test_android_syncfence.cpp

files renamed:
debian/libmirclient2.install => debian/libmirclient3.install

debian/libmirserver3.install => debian/libmirserver4.install

include/server/mir/frontend/communicator.h => include/server/mir/frontend/connector.h

include/server/mir/frontend/communicator_report.h => include/server/mir/frontend/connector_report.h

src/shared/graphics/android/syncfence.h => include/shared/mir/graphics/android/syncfence.h

include/test/mir_test_doubles/mock_hwc_organizer.h => include/test/mir_test_doubles/mock_hwc_layerlist.h

src/server/frontend/make_protobuf_socket_communicator.cpp => src/server/frontend/default_configuration.cpp

src/server/frontend/protobuf_socket_communicator.cpp => src/server/frontend/published_socket_connector.cpp

src/server/frontend/protobuf_socket_communicator.h => src/server/frontend/published_socket_connector.h

tests/unit-tests/frontend/test_protobuf_communicator.cpp => tests/unit-tests/frontend/test_published_socket_connector.cpp

files modified:
3rd_party/android-deps/android/input.h

3rd_party/android-deps/std/PropertyMap.h

3rd_party/android-deps/std/Vector.h

3rd_party/android-input/README

3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

CMakeLists.txt

debian/changelog

debian/control

debian/rules

doc/debug_for_xmir.md

examples/basic_server.cpp

examples/demo-shell/demo_shell.cpp

examples/demo-shell/window_manager.cpp

examples/demo-shell/window_manager.h

examples/demo_client_display_config.c

examples/render_surfaces.cpp

examples/server_configuration.cpp

include/platform/mir/graphics/display_buffer.h

include/platform/mir/graphics/display_configuration.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/display_changer.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/logging/session_mediator_report.h

include/server/mir/server_configuration.h

include/server/mir/shell/mediating_display_changer.h

include/server/mir/shell/unauthorized_display_changer.h

include/shared/mir_toolkit/client_types.h

include/shared/mir_toolkit/common.h

include/test/mir_test/test_protobuf_server.h

include/test/mir_test_doubles/mock_display_changer.h

include/test/mir_test_doubles/mock_display_support_provider.h

include/test/mir_test_doubles/mock_hwc_interface.h

include/test/mir_test_doubles/null_display_changer.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_framework/cross_process_sync.h

src/client/CMakeLists.txt

src/client/display_configuration.cpp

src/client/mir_connection.cpp

src/client/rpc/make_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/platform/graphics/default_display_configuration_policy.cpp

src/server/CMakeLists.txt

src/server/compositor/default_display_buffer_compositor.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/null_session_mediator_report.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_messenger.h

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_display_allocator.cpp

src/server/graphics/android/android_display_allocator.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_hwc_factory.cpp

src/server/graphics/android/display_allocator.h

src/server/graphics/android/display_support_provider.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/gpu_hwc_android_display_buffer_factory.cpp

src/server/graphics/android/hwc10_device.cpp

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc11_device.cpp

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/hwc_device.h

src/server/graphics/android/hwc_layerlist.cpp

src/server/graphics/android/hwc_layerlist.h

src/server/graphics/android/internal_client.cpp

src/server/graphics/android/internal_client.h

src/server/graphics/android/internal_client_window.cpp

src/server/graphics/android/server_render_window.cpp

src/server/graphics/gbm/gbm_buffer_allocator.cpp

src/server/graphics/gbm/gbm_buffer_allocator.h

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/gbm_display.h

src/server/graphics/gbm/gbm_display_buffer.h

src/server/graphics/gbm/kms_output.h

src/server/graphics/gbm/real_kms_display_configuration.cpp

src/server/graphics/gbm/real_kms_display_configuration.h

src/server/graphics/gbm/real_kms_output.cpp

src/server/graphics/gbm/real_kms_output.h

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/logging/CMakeLists.txt

src/server/logging/session_mediator_report.cpp

src/server/options/program_option.cpp

src/server/shell/mediating_display_changer.cpp

src/server/shell/unauthorized_display_changer.cpp

src/shared/graphics/android/mir_native_window.cpp

src/shared/graphics/android/syncfence.cpp

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_test_framework.cpp

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_error_reporting.cpp

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/mir_test_framework/cross_process_sync.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/android_input/CMakeLists.txt

tests/unit-tests/client/android/CMakeLists.txt

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

tests/unit-tests/frontend/test_protobuf_surface_apis.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/android/test_android_display_factory.cpp

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_gpu_display.cpp

tests/unit-tests/graphics/android/test_hwc10_device.cpp

tests/unit-tests/graphics/android/test_hwc11_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_hwc_layerlist.cpp

tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp

tests/unit-tests/graphics/android/test_server_interpreter.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/gbm/test_gbm_cursor.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_overlapping_output_grouping.cpp

tests/unit-tests/graphics/gbm/test_real_kms_output.cpp

tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

Show diffs side-by-side

added added

removed removed

3rd_party/android-deps/android/input.h

3rd_party/android-deps/std/PropertyMap.h

3rd_party/android-deps/std/Vector.h

3rd_party/android-input/README

3rd_party/android-input/android/frameworks/base/services/input/InputReader.cpp

3rd_party/android-input/android/frameworks/base/services/input/InputReader.h

debian/changelog

debian/libmirclient3.install

debian/libmirserver4.install

doc/debug_for_xmir.md

examples/basic_server.cpp

examples/demo-shell/demo_shell.cpp

examples/demo-shell/window_manager.cpp

examples/demo-shell/window_manager.h

examples/demo_client_display_config.c

examples/render_surfaces.cpp

examples/server_configuration.cpp

include/platform/mir/graphics/display_buffer.h

include/platform/mir/graphics/display_configuration.h

include/server/mir/default_pause_resume_listener.h

include/server/mir/default_server_configuration.h

include/server/mir/frontend/connector.h

include/server/mir/frontend/connector_report.h

include/server/mir/frontend/display_changer.h

include/server/mir/frontend/messenger_report.h

include/server/mir/frontend/protobuf_ipc_factory.h

include/server/mir/frontend/session_creator.h

include/server/mir/frontend/session_mediator_report.h

include/server/mir/logging/messenger_report.h

include/server/mir/logging/session_mediator_report.h

include/server/mir/pause_resume_listener.h

include/server/mir/server_configuration.h

include/server/mir/shell/mediating_display_changer.h

include/server/mir/shell/unauthorized_display_changer.h

include/shared/mir/graphics/android/syncfence.h

include/shared/mir_toolkit/client_types.h

include/shared/mir_toolkit/common.h

include/test/mir_test/test_protobuf_server.h

include/test/mir_test_doubles/mock_display_changer.h

include/test/mir_test_doubles/mock_display_support_provider.h

include/test/mir_test_doubles/mock_hwc_interface.h

include/test/mir_test_doubles/mock_hwc_layerlist.h

include/test/mir_test_doubles/mock_pause_resume_listener.h

include/test/mir_test_doubles/null_display_changer.h

include/test/mir_test_doubles/null_display_config.h

include/test/mir_test_doubles/null_display_configuration.h

include/test/mir_test_doubles/stub_display_configuration.h

include/test/mir_test_doubles/stub_display_support_provider.h

include/test/mir_test_doubles/stub_ipc_factory.h

include/test/mir_test_framework/cross_process_sync.h

src/client/CMakeLists.txt

src/client/display_configuration.cpp

src/client/mir_connection.cpp

src/client/rpc/make_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.cpp

src/client/rpc/mir_socket_rpc_channel.h

src/platform/graphics/default_display_configuration_policy.cpp

src/server/CMakeLists.txt

src/server/compositor/default_display_buffer_compositor.cpp

src/server/default_server_configuration.cpp

src/server/display_server.cpp

src/server/frontend/CMakeLists.txt

src/server/frontend/default_configuration.cpp

src/server/frontend/null_messenger_report.cpp

src/server/frontend/null_session_mediator_report.cpp

src/server/frontend/protobuf_buffer_packer.cpp

src/server/frontend/protobuf_session_creator.cpp

src/server/frontend/protobuf_session_creator.h

src/server/frontend/published_socket_connector.cpp

src/server/frontend/published_socket_connector.h

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_messenger.cpp

src/server/frontend/socket_messenger.h

src/server/graphics/android/CMakeLists.txt

src/server/graphics/android/android_display.cpp

src/server/graphics/android/android_display.h

src/server/graphics/android/android_display_allocator.cpp

src/server/graphics/android/android_display_allocator.h

src/server/graphics/android/android_display_configuration.cpp

src/server/graphics/android/android_display_configuration.h

src/server/graphics/android/android_display_factory.cpp

src/server/graphics/android/android_hwc_factory.cpp

src/server/graphics/android/display_allocator.h

src/server/graphics/android/display_support_provider.h

src/server/graphics/android/fb_device.cpp

src/server/graphics/android/fb_device.h

src/server/graphics/android/gpu_hwc_android_display_buffer_factory.cpp

src/server/graphics/android/hwc10_device.cpp

src/server/graphics/android/hwc10_device.h

src/server/graphics/android/hwc11_device.cpp

src/server/graphics/android/hwc11_device.h

src/server/graphics/android/hwc_common_device.cpp

src/server/graphics/android/hwc_common_device.h

src/server/graphics/android/hwc_device.h

src/server/graphics/android/hwc_layerlist.cpp

src/server/graphics/android/hwc_layerlist.h

src/server/graphics/android/internal_client.cpp

src/server/graphics/android/internal_client.h

src/server/graphics/android/internal_client_window.cpp

src/server/graphics/android/server_render_window.cpp

src/server/graphics/gbm/gbm_buffer_allocator.cpp

src/server/graphics/gbm/gbm_buffer_allocator.h

src/server/graphics/gbm/gbm_display.cpp

src/server/graphics/gbm/gbm_display.h

src/server/graphics/gbm/gbm_display_buffer.h

src/server/graphics/gbm/kms_output.h

src/server/graphics/gbm/real_kms_display_configuration.cpp

src/server/graphics/gbm/real_kms_display_configuration.h

src/server/graphics/gbm/real_kms_output.cpp

src/server/graphics/gbm/real_kms_output.h

src/server/graphics/nested/nested_display_configuration.cpp

src/server/graphics/nested/nested_display_configuration.h

src/server/logging/CMakeLists.txt

src/server/logging/messenger_report.cpp

src/server/logging/session_mediator_report.cpp

src/server/options/program_option.cpp

src/server/shell/mediating_display_changer.cpp

src/server/shell/unauthorized_display_changer.cpp

src/shared/graphics/android/mir_native_window.cpp

src/shared/graphics/android/syncfence.cpp

src/shared/protobuf/mir_protobuf.proto

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_test_framework.cpp

tests/integration-tests/client/test_client_render.cpp

tests/integration-tests/graphics/android/test_display_integration.cpp

tests/integration-tests/shell/test_session.cpp

tests/integration-tests/test_display_server_main_loop_events.cpp

tests/integration-tests/test_error_reporting.cpp

tests/mir_test/display_config_matchers.cpp

tests/mir_test_doubles/test_protobuf_socket_server.cpp

tests/mir_test_framework/cross_process_sync.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/mir_test_framework/testing_process_manager.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/unit-tests/android_input/CMakeLists.txt

tests/unit-tests/android_input/input_reader.cpp

tests/unit-tests/client/android/CMakeLists.txt

tests/unit-tests/client/android/test_android_syncfence.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/frontend/CMakeLists.txt

tests/unit-tests/frontend/stress_protobuf_communicator.cpp

tests/unit-tests/frontend/test_protobuf_reports_errors.cpp

tests/unit-tests/frontend/test_protobuf_sends_fds.cpp

tests/unit-tests/frontend/test_protobuf_surface_apis.cpp

tests/unit-tests/frontend/test_published_socket_connector.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/android/test_android_display_factory.cpp

tests/unit-tests/graphics/android/test_android_fb.cpp

tests/unit-tests/graphics/android/test_gpu_display.cpp

tests/unit-tests/graphics/android/test_hwc10_device.cpp

tests/unit-tests/graphics/android/test_hwc11_device.cpp

tests/unit-tests/graphics/android/test_hwc_device.cpp

tests/unit-tests/graphics/android/test_hwc_display.cpp

tests/unit-tests/graphics/android/test_hwc_layerlist.cpp

tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp

tests/unit-tests/graphics/android/test_server_interpreter.cpp

tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp

tests/unit-tests/graphics/gbm/test_gbm_cursor.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp

tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp

tests/unit-tests/graphics/gbm/test_overlapping_output_grouping.cpp

tests/unit-tests/graphics/gbm/test_real_kms_output.cpp

tests/unit-tests/graphics/nested/test_nested_display_configuration.cpp

tests/unit-tests/graphics/test_default_display_configuration_policy.cpp

tests/unit-tests/graphics/test_display.cpp

tests/unit-tests/graphics/test_display_configuration.cpp

Older »