← Back to branch summary

~raof/mir/provide-event-fd

~raof/mir/provide-event-fd

« back to all changes in this revision

Viewing changes to benchmarks/frame-uniformity/touch_measuring_client.h

Committer: Christopher James Halse Rogers
Date: 2015-05-05 07:51:14 UTC
mfrom: (2239.1.302 development-branch)
Revision ID: christopher.halse.rogers@canonical.com-20150505075114-2x0qchr01p9syur2

Merge trunk

files added:
include/client/mir/event_printer.h

src/client/event_printer.cpp

src/include/platform/mir/graphics/egl_error.h

src/platform/graphics/egl_error.cpp

src/platforms/android/server/power_mode.h

src/server/graphics/nested/cursor.cpp

src/server/graphics/nested/cursor.h

src/server/input/android/input_reader_dispatchable.cpp

src/server/input/android/input_reader_dispatchable.h

tests/acceptance-tests/test_nested_input.cpp

tests/acceptance-tests/test_surface_placement.cpp

tests/include/mir_test_doubles/mock_event_hub.h

tests/include/mir_test_doubles/mock_input_reader.h

tests/include/mir_test_doubles/nested_mock_egl.h

tests/include/mir_test_doubles/stub_cursor.h

tests/include/mir_test_doubles/stub_cursor_listener.h

tests/mir_test/event_matchers.cpp

tests/mir_test_doubles/nested_mock_egl.cpp

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

tests/unit-tests/graphics/test_egl_error.cpp

tests/unit-tests/input/android/test_input_dispatcher.cpp

tests/unit-tests/input/android/test_input_reader_dispatchable.cpp

tools/discover_gtests.sh

tools/run_ctests.sh

files removed:
cmake/src/mir/mir_discover_gtest_tests.cpp

src/server/input/android/android_input_manager.cpp

src/server/input/android/android_input_manager.h

tests/integration-tests/input/android/test_android_input_manager.cpp

tests/integration-tests/input/test_nested_input.cpp

files renamed:
tests/include/mir_test_framework/cross_process_sync.h => tests/include/mir_test/cross_process_sync.h

tests/mir_test_framework/cross_process_sync.cpp => tests/mir_test/cross_process_sync.cpp

tests/unit-tests/input/android/test_android_input_manager.cpp => tests/unit-tests/input/android/test_android_input_channel_factory.cpp

files modified:
3rd_party/CMakeLists.txt

3rd_party/android-input/android/CMakeLists.txt

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

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

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

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

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

3rd_party/xcursor/CMakeLists.txt

CMakeLists.txt

benchmarks/android-input/CMakeLists.txt

benchmarks/benchmark_multiplexing_dispatchable.cpp

benchmarks/frame-uniformity/CMakeLists.txt

benchmarks/frame-uniformity/touch_measuring_client.cpp

benchmarks/frame-uniformity/touch_measuring_client.h

cmake/ABICheck.cmake

cmake/MirCommon.cmake

cmake/src/mir/CMakeLists.txt

debian/changelog

debian/libmirclient-dev.install

doc/demo_shell_controls.md

doc/footer.html.in

doc/mainpage.md

examples/CMakeLists.txt

examples/eglsquare.cpp

examples/fingerpaint.c

examples/multiwin.c

examples/progressbar.c

examples/render_surfaces.cpp

examples/server_example.cpp

examples/server_example_basic_window_manager.h

examples/server_example_canonical_window_manager.cpp

examples/server_example_canonical_window_manager.h

examples/server_example_custom_compositor.cpp

examples/server_example_tiling_window_manager.cpp

examples/server_example_tiling_window_manager.h

examples/server_example_window_management.cpp

examples/tooltip.c

include/client/mir_toolkit/mir_client_library_drm.h

include/client/mir_toolkit/mir_surface.h

include/common/mir/dispatch/multiplexing_dispatchable.h

include/common/mir/dispatch/threaded_dispatcher.h

include/common/mir/geometry/dimensions.h

include/server/mir/input/input_device_hub.h

include/server/mir/scene/session.h

include/server/mir/scene/surface.h

include/server/mir/scene/surface_creation_parameters.h

include/server/mir/shell/abstract_shell.h

include/server/mir/shell/focus_controller.h

include/server/mir/shell/input_targeter.h

include/server/mir/shell/shell_wrapper.h

include/server/mir/shell/surface_specification.h

playground/demo-shell/window_manager.cpp

src/client/CMakeLists.txt

src/client/buffer_stream.cpp

src/client/buffer_stream.h

src/client/client_buffer_depository.cpp

src/client/client_buffer_depository.h

src/client/input/CMakeLists.txt

src/client/logging/input_receiver_report.cpp

src/client/logging/rpc_report.cpp

src/client/logging/rpc_report.h

src/client/lttng/CMakeLists.txt

src/client/lttng/rpc_report.cpp

src/client/lttng/rpc_report.h

src/client/mir_surface.cpp

src/client/mir_surface.h

src/client/mir_surface_api.cpp

src/client/rpc/CMakeLists.txt

src/client/rpc/mir_protobuf_rpc_channel.cpp

src/client/rpc/null_rpc_report.cpp

src/client/rpc/null_rpc_report.h

src/client/rpc/rpc_report.h

src/client/rpc/stream_socket_transport.cpp

src/client/rpc/stream_socket_transport.h

src/client/rpc/stream_transport.h

src/client/symbols.map

src/common/dispatch/threaded_dispatcher.cpp

src/common/graphics/android/CMakeLists.txt

src/common/graphics/android/mir_native_window.cpp

src/common/logging/logger.cpp

src/common/sharedlibrary/CMakeLists.txt

src/include/client/mir/egl_native_surface.h

src/include/common/mir/graphics/android/android_driver_interpreter.h

src/include/server/mir/default_server_configuration.h

src/include/server/mir/server_configuration.h

src/platform/graphics/CMakeLists.txt

src/platform/graphics/egl_resources.cpp

src/platform/graphics/platform_probe.cpp

src/platform/options/default_configuration.cpp

src/platform/symbols.map

src/platforms/android/client/CMakeLists.txt

src/platforms/android/client/egl_native_surface_interpreter.cpp

src/platforms/android/client/egl_native_surface_interpreter.h

src/platforms/android/server/CMakeLists.txt

src/platforms/android/server/buffer.cpp

src/platforms/android/server/display_configuration.cpp

src/platforms/android/server/gl_context.cpp

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hwc_blanking_control.cpp

src/platforms/android/server/hwc_configuration.h

src/platforms/android/server/hwc_loggers.cpp

src/platforms/android/server/hwc_loggers.h

src/platforms/android/server/hwc_report.h

src/platforms/android/server/hwc_wrapper.h

src/platforms/android/server/platform.h

src/platforms/android/server/real_hwc_wrapper.cpp

src/platforms/android/server/real_hwc_wrapper.h

src/platforms/android/server/resource_factory.cpp

src/platforms/android/server/server_render_window.cpp

src/platforms/android/server/server_render_window.h

src/platforms/mesa/client/CMakeLists.txt

src/platforms/mesa/include/mir_toolkit/mesa/native_display.h

src/platforms/mesa/server/CMakeLists.txt

src/platforms/mesa/server/buffer_allocator.cpp

src/platforms/mesa/server/display_helpers.cpp

src/protobuf/mir_protobuf.proto

src/server/CMakeLists.txt

src/server/compositor/buffer_queue.cpp

src/server/display_server.cpp

src/server/frontend/buffer_stream_tracker.h

src/server/frontend/protobuf_buffer_packer.h

src/server/frontend/session_mediator.cpp

src/server/frontend/socket_messenger.cpp

src/server/graphics/default_configuration.cpp

src/server/graphics/nested/CMakeLists.txt

src/server/graphics/nested/display.cpp

src/server/graphics/nested/display.h

src/server/graphics/nested/display_buffer.cpp

src/server/graphics/nested/display_buffer.h

src/server/graphics/nested/host_connection.h

src/server/graphics/nested/mir_client_host_connection.cpp

src/server/graphics/nested/mir_client_host_connection.h

src/server/graphics/offscreen/display.cpp

src/server/graphics/surfaceless_egl_context.cpp

src/server/input/android/CMakeLists.txt

src/server/input/android/android_input_targeter.cpp

src/server/input/android/android_input_targeter.h

src/server/input/default_configuration.cpp

src/server/input/default_input_manager.cpp

src/server/input/default_input_manager.h

src/server/input/null_input_targeter.cpp

src/server/input/null_input_targeter.h

src/server/run_mir.cpp

src/server/scene/application_session.cpp

src/server/scene/application_session.h

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/shell/abstract_shell.cpp

src/server/shell/basic_window_manager.h

src/server/shell/canonical_window_manager.cpp

src/server/shell/canonical_window_manager.h

src/server/shell/shell_wrapper.cpp

src/server/symbols.map

src/utils/out.c

src/utils/ping.c

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/server_configuration_wrapping.cpp

tests/acceptance-tests/server_signal_handling.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_client_input.cpp

tests/acceptance-tests/test_client_library.cpp

tests/acceptance-tests/test_client_surfaces.cpp

tests/acceptance-tests/test_custom_window_management.cpp

tests/acceptance-tests/test_latency.cpp

tests/acceptance-tests/test_nested_mir.cpp

tests/acceptance-tests/test_render_override.cpp

tests/acceptance-tests/test_server_disconnect.cpp

tests/acceptance-tests/test_server_shutdown.cpp

tests/acceptance-tests/test_surface_modifications.cpp

tests/acceptance-tests/throwback/test_client_cursor_api.cpp

tests/acceptance-tests/throwback/test_custom_input_dispatcher.cpp

tests/acceptance-tests/throwback/test_focus_selection.cpp

tests/include/mir_test/cross_process_action.h

tests/include/mir_test/event_matchers.h

tests/include/mir_test/fake_event_hub.h

tests/include/mir_test_doubles/mock_client_buffer_factory.h

tests/include/mir_test_doubles/mock_client_buffer_stream_factory.h

tests/include/mir_test_doubles/mock_egl.h

tests/include/mir_test_doubles/mock_egl_native_surface.h

tests/include/mir_test_doubles/mock_hwc_composer_device_1.h

tests/include/mir_test_doubles/mock_hwc_device_wrapper.h

tests/include/mir_test_doubles/mock_hwc_report.h

tests/include/mir_test_doubles/mock_input_targeter.h

tests/include/mir_test_doubles/mock_rpc_report.h

tests/include/mir_test_doubles/mock_scene_session.h

tests/include/mir_test_doubles/mock_surface.h

tests/include/mir_test_doubles/null_display.h

tests/include/mir_test_doubles/stub_buffer.h

tests/include/mir_test_doubles/stub_client_buffer.h

tests/include/mir_test_doubles/stub_driver_interpreter.h

tests/include/mir_test_doubles/stub_host_connection.h

tests/include/mir_test_doubles/stub_input_targeter.h

tests/include/mir_test_doubles/stub_scene_session.h

tests/include/mir_test_doubles/stub_scene_surface.h

tests/include/mir_test_framework/connected_client_with_a_surface.h

tests/include/mir_test_framework/interprocess_client_server_test.h

tests/include/mir_test_framework/testing_server_configuration.h

tests/integration-tests/CMakeLists.txt

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

tests/integration-tests/input/CMakeLists.txt

tests/integration-tests/input/android/CMakeLists.txt

tests/integration-tests/input/android/test_android_cursor_listener.cpp

tests/integration-tests/test_default_window_manager.cpp

tests/integration-tests/test_display_info.cpp

tests/integration-tests/test_drm_auth_magic.cpp

tests/integration-tests/test_error_reporting.cpp

tests/integration-tests/test_exchange_buffer.cpp

tests/integration-tests/test_server_shutdown.cpp

tests/integration-tests/test_stale_frames.cpp

tests/integration-tests/test_surface_first_frame_sync.cpp

tests/integration-tests/test_surfaceloop.cpp

tests/integration-tests/test_swapinterval.cpp

tests/integration-tests/test_test_framework.cpp

tests/mir-stress/src/client.cpp

tests/mir_test/CMakeLists.txt

tests/mir_test_doubles/CMakeLists.txt

tests/mir_test_doubles/fake_event_hub.cpp

tests/mir_test_doubles/mock_egl.cpp

tests/mir_test_framework/CMakeLists.txt

tests/mir_test_framework/connected_client_with_a_surface.cpp

tests/mir_test_framework/interprocess_client_server_test.cpp

tests/mir_test_framework/stub_client_platform_factory.cpp

tests/mir_test_framework/stubbed_graphics_platform.cpp

tests/mir_test_framework/stubbed_server_configuration.cpp

tests/mir_test_framework/testing_server_options.cpp

tests/performance-tests/CMakeLists.txt

tests/unit-tests/CMakeLists.txt

tests/unit-tests/android_input/test_eventhub.cpp

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

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

tests/unit-tests/client/test_client_buffer_depository.cpp

tests/unit-tests/client/test_client_buffer_stream.cpp

tests/unit-tests/client/test_client_mir_surface.cpp

tests/unit-tests/client/test_mir_screencast.cpp

tests/unit-tests/client/test_protobuf_rpc_channel.cpp

tests/unit-tests/client/test_stream_transport.cpp

tests/unit-tests/dispatch/test_action_queue.cpp

tests/unit-tests/dispatch/test_threaded_dispatcher.cpp

tests/unit-tests/frontend/test_protobuf_message_processor.cpp

tests/unit-tests/frontend/test_session_mediator.cpp

tests/unit-tests/graphics/CMakeLists.txt

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

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

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

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

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

tests/unit-tests/graphics/nested/CMakeLists.txt

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

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

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

tests/unit-tests/input/android/test_android_input_targeter.cpp

tests/unit-tests/input/test_default_input_manager.cpp

tests/unit-tests/scene/test_abstract_shell.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/shell/test_graphics_display_layout.cpp

Show diffs side-by-side

added added

removed removed

benchmarks/frame-uniformity/touch_measuring_client.h

23

23

24

24

#include "mir_test/barrier.h"

25

25

26

#include "mir_toolkit/mir_client_library.h"

27

28

26

#include <chrono>

29

27

#include <memory>

30

#include <vector>

31

#include <string>

32

#include <mutex>

33

28

34

29

class TouchMeasuringClient

35

30

{

Older »