Merge lp:~raof/mir/actually-call-input-receiver-report into lp:mir

[Chris Halse Rogers]

input: Make the client InputReceiverReport work

By actually calling it during event processing"

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4276
https://mir-jenkins.ubuntu.com/job/mir-ci/3712/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5090
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5328
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5316
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5135/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5135
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5135/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3712/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Was stuck for 16 hours... on some strange jenkins issues. Restarting

=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2017-07-28 17:00:43 +0000
+++ src/client/default_connection_configuration.cpp	2017-09-29 16:27:00 +0000
@@ -71,7 +71,7 @@
             return mcl::rpc::make_rpc_channel(
                 the_socket_file(), the_surface_map(), the_buffer_factory(),
                 the_display_configuration(), the_input_devices(), the_rpc_report(),
-                the_lifecycle_control(), the_ping_handler(),
+                the_input_receiver_report(), the_lifecycle_control(), the_ping_handler(),
                 the_error_handler(), the_event_sink());
         });
 }

=== modified file 'src/client/rpc/make_rpc_channel.h'
--- src/client/rpc/make_rpc_channel.h	2017-07-28 17:00:43 +0000
+++ src/client/rpc/make_rpc_channel.h	2017-09-29 16:27:00 +0000
@@ -29,6 +29,11 @@
 namespace input
 {
 class InputDevices;
+
+namespace receiver
+{
+class InputReceiverReport;
+}
 }
 namespace client
 {
@@ -50,6 +55,7 @@
     std::shared_ptr<DisplayConfiguration> const& disp_conf,
     std::shared_ptr<input::InputDevices> const& input_devices,
     std::shared_ptr<RpcReport> const& rpc_report,
+    std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
     std::shared_ptr<LifecycleControl> const& lifecycle_control,
     std::shared_ptr<PingHandler> const& ping_handler,
     std::shared_ptr<ErrorHandler> const& error_handler,

=== modified file 'src/client/rpc/make_socket_rpc_channel.cpp'
--- src/client/rpc/make_socket_rpc_channel.cpp	2017-07-28 17:00:43 +0000
+++ src/client/rpc/make_socket_rpc_channel.cpp	2017-09-29 16:27:00 +0000
@@ -48,6 +48,7 @@
     std::shared_ptr<mcl::DisplayConfiguration> const& disp_conf,
     std::shared_ptr<input::InputDevices> const& input_devices,
     std::shared_ptr<RpcReport> const& rpc_report,
+    std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
     std::shared_ptr<mcl::LifecycleControl> const& lifecycle_control,
     std::shared_ptr<mcl::PingHandler> const& ping_handler,
     std::shared_ptr<mcl::ErrorHandler> const& error_handler,
@@ -65,6 +66,6 @@
     }
     return std::make_shared<MirProtobufRpcChannel>(
         std::move(transport), map, buffer_factory, disp_conf,
-        input_devices, rpc_report, lifecycle_control, ping_handler,
+        input_devices, rpc_report, input_report, lifecycle_control, ping_handler,
         error_handler, event_sink);
 }

=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2017-07-28 17:00:43 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2017-09-29 16:27:00 +0000
@@ -18,6 +18,7 @@
 
 #include "mir_protobuf_rpc_channel.h"
 #include "rpc_report.h"
+#include "mir/input/input_receiver_report.h"
 
 #include "mir/client/surface_map.h"
 #include "../buffer.h"
@@ -61,12 +62,14 @@
     std::shared_ptr<DisplayConfiguration> const& disp_config,
     std::shared_ptr<input::InputDevices> const& input_devices,
     std::shared_ptr<RpcReport> const& rpc_report,
+    std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
     std::shared_ptr<LifecycleControl> const& lifecycle_control,
     std::shared_ptr<PingHandler> const& ping_handler,
     std::shared_ptr<ErrorHandler> const& error_handler,
     std::shared_ptr<EventSink> const& event_sink) :
     rpc_report(rpc_report),
     pending_calls(rpc_report),
+    input_report(input_report),
     surface_map(surface_map),
     buffer_factory(buffer_factory),
     display_configuration(disp_config),
@@ -426,6 +429,7 @@
                         window_id = e->to_close_window()->surface_id();
                         break;
                     case mir_event_type_keymap:
+                        input_report->received_event(*e);
                         window_id = e->to_keymap()->surface_id();
                         break;
                     case mir_event_type_window_output:
@@ -435,9 +439,11 @@
                         window_id = e->to_window_placement()->id();
                         break;
                     case mir_event_type_input:
+                        input_report->received_event(*e);
                         window_id = e->to_input()->window_id();
                         break;
                     case mir_event_type_input_device_state:
+                        input_report->received_event(*e);
                         window_id = e->to_input_device_state()->window_id();
                         break;
                     default:

=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.h'
--- src/client/rpc/mir_protobuf_rpc_channel.h	2017-07-28 17:00:43 +0000
+++ src/client/rpc/mir_protobuf_rpc_channel.h	2017-09-29 16:27:00 +0000
@@ -39,6 +39,12 @@
 namespace input
 {
 class InputDevices;
+
+namespace receiver
+{
+class InputReceiverReport;
+}
+
 }
 namespace client
 {
@@ -46,6 +52,7 @@
 class SurfaceMap;
 class EventSink;
 class AsyncBufferFactory;
+
 namespace rpc
 {
 
@@ -63,6 +70,7 @@
                           std::shared_ptr<DisplayConfiguration> const& disp_config,
                           std::shared_ptr<input::InputDevices> const& input_devices,
                           std::shared_ptr<RpcReport> const& rpc_report,
+                          std::shared_ptr<input::receiver::InputReceiverReport> const& input_report,
                           std::shared_ptr<LifecycleControl> const& lifecycle_control,
                           std::shared_ptr<PingHandler> const& ping_handler,
                           std::shared_ptr<ErrorHandler> const& error_handler,
@@ -105,6 +113,8 @@
     std::shared_ptr<RpcReport> const rpc_report;
     detail::PendingCallCache pending_calls;
 
+    std::shared_ptr<input::receiver::InputReceiverReport> const input_report;
+
     std::mutex discard_mutex;
     bool discard{false};
 

=== modified file 'tests/include/mir/test/test_protobuf_client.h'
--- tests/include/mir/test/test_protobuf_client.h	2017-07-28 17:00:43 +0000
+++ tests/include/mir/test/test_protobuf_client.h	2017-09-29 16:27:00 +0000
@@ -33,6 +33,13 @@
 
 namespace mir
 {
+namespace input
+{
+namespace receiver
+{
+class NullInputReceiverReport;
+}
+}
 namespace client
 {
 class SurfaceMap;
@@ -53,6 +60,7 @@
     TestProtobufClient(std::string socket_file, int timeout_ms);
 
     std::shared_ptr<doubles::MockRpcReport> rpc_report;
+    std::shared_ptr<input::receiver::NullInputReceiverReport> input_report;
     std::shared_ptr<mir::client::SurfaceMap> surface_map;
     std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> channel;
     std::shared_ptr<dispatch::ThreadedDispatcher> eventloop;

=== modified file 'tests/mir_test_doubles/test_protobuf_client.cpp'
--- tests/mir_test_doubles/test_protobuf_client.cpp	2017-07-28 17:00:43 +0000
+++ tests/mir_test_doubles/test_protobuf_client.cpp	2017-09-29 16:27:00 +0000
@@ -18,6 +18,7 @@
 
 #include "mir/test/test_protobuf_client.h"
 #include "mir/test/doubles/mock_rpc_report.h"
+#include "mir/input/null_input_receiver_report.h"
 #include "mir/test/doubles/null_client_event_sink.h"
 
 #include "src/client/connection_surface_map.h"
@@ -50,6 +51,7 @@
         std::make_shared<mir::client::DisplayConfiguration>(),
         std::make_shared<mir::input::InputDevices>(surface_map),
         rpc_report,
+        input_report,
         std::make_shared<mir::client::LifecycleControl>(),
         std::make_shared<mir::client::AtomicCallback<int32_t>>(),
         std::make_shared<mir::client::AtomicCallback<MirError const*>>(),

=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2017-07-28 17:00:43 +0000
+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2017-09-29 16:27:00 +0000
@@ -31,6 +31,7 @@
 #include "mir/client/surface_map.h"
 #include "mir/input/input_devices.h"
 
+#include "mir/input/null_input_receiver_report.h"
 #include "mir/test/doubles/null_client_event_sink.h"
 #include "mir/test/doubles/mock_mir_buffer_stream.h"
 #include "mir/test/doubles/mock_client_buffer.h"
@@ -248,6 +249,7 @@
                   std::make_shared<mcl::DisplayConfiguration>(),
                   std::make_shared<mir::input::InputDevices>(surface_map),
                   std::make_shared<mclr::NullRpcReport>(),
+                  std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
                   lifecycle,
                   std::make_shared<mir::client::PingHandler>(),
                   std::make_shared<mir::client::ErrorHandler>(),
@@ -404,6 +406,7 @@
                   std::make_shared<mcl::DisplayConfiguration>(),
                   std::make_shared<mir::input::InputDevices>(stream_map),
                   std::make_shared<mclr::NullRpcReport>(),
+                  std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
                   lifecycle,
                   std::make_shared<mir::client::PingHandler>(),
                   std::make_shared<mir::client::ErrorHandler>(),
@@ -760,6 +763,7 @@
                   std::make_shared<mcl::DisplayConfiguration>(),
                   std::make_shared<mir::input::InputDevices>(stream_map),
                   std::make_shared<mclr::NullRpcReport>(),
+                  std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
                   lifecycle,
                   std::make_shared<mir::client::PingHandler>(),
                   std::make_shared<mir::client::ErrorHandler>(),
@@ -798,6 +802,7 @@
                   std::make_shared<mcl::DisplayConfiguration>(),
                   std::make_shared<mir::input::InputDevices>(stream_map),
                   std::make_shared<mclr::NullRpcReport>(),
+                  std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
                   lifecycle,
                   std::make_shared<mir::client::PingHandler>(),
                   std::make_shared<mir::client::ErrorHandler>(),
@@ -834,6 +839,7 @@
                   std::make_shared<mcl::DisplayConfiguration>(),
                   std::make_shared<mir::input::InputDevices>(stream_map),
                   std::make_shared<mclr::NullRpcReport>(),
+                  std::make_shared<mir::input::receiver::NullInputReceiverReport>(),
                   lifecycle,
                   std::make_shared<mir::client::PingHandler>(),
                   std::make_shared<mir::client::ErrorHandler>(),

=== modified file 'tests/unit-tests/frontend/stress_protobuf_communicator.cpp'
--- tests/unit-tests/frontend/stress_protobuf_communicator.cpp	2017-07-28 17:00:43 +0000
+++ tests/unit-tests/frontend/stress_protobuf_communicator.cpp	2017-09-29 16:27:00 +0000
@@ -37,6 +37,7 @@
 #include "src/client/rpc/mir_display_server.h"
 #include "src/client/buffer_factory.h"
 #include "mir/input/input_devices.h"
+#include "mir/input/null_input_receiver_report.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -59,6 +60,7 @@
     StubProtobufClient(std::string socket_file, int timeout_ms);
 
     std::shared_ptr<mir::client::rpc::RpcReport> rpc_report;
+    std::shared_ptr<mir::input::receiver::InputReceiverReport> input_report;
     std::shared_ptr<mir::client::SurfaceMap> surface_map;
     std::shared_ptr<mir::client::rpc::MirBasicRpcChannel> channel;
     mir::client::rpc::DisplayServer display_server;
@@ -163,6 +165,7 @@
     std::string socket_file,
     int timeout_ms) :
     rpc_report(std::make_shared<mir::client::rpc::NullRpcReport>()),
+    input_report(std::make_shared<mir::input::receiver::NullInputReceiverReport>()),
     surface_map(std::make_shared<mir::client::ConnectionSurfaceMap>()),
     channel(mir::client::rpc::make_rpc_channel(
         socket_file,
@@ -171,6 +174,7 @@
         std::make_shared<mir::client::DisplayConfiguration>(),
         std::make_shared<mir::input::InputDevices>(surface_map),
         rpc_report,
+        input_report,
         std::make_shared<mir::client::LifecycleControl>(),
         std::make_shared<mir::client::PingHandler>(),
         std::make_shared<mir::client::ErrorHandler>(),