Merge lp:~vanvugt/mir/fix-1528438 into lp:mir

[Daniel van Vugt]

Don't crash the server when you encounter a client that ignores input.
They're perfectly common. (LP: #1528438)

The throw was only added in recently on 19 Dec 2015.

[Kevin DuBois (kdub)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3230
http://jenkins.qa.ubuntu.com/job/mir-ci/5958/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5460
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/282
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/282
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5413
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5413/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7903
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26497
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/241
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/99
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26501

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5958/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:3230
https://mir-jenkins.ubuntu.com/job/mir-ci/2/
Executed test runs:
    None: https://mir-jenkins.ubuntu.com/job/generic-update-mp/2/console

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

Back then I thought mir clients would always just grab the input from the fd.. and then ignore it. So I assumes that WOULD_BLOCK means something goes wrong.. I am fine with ignoring the failure and droping the send - attempt. At least that is what I planed to do in the two input dispatchers in most of the exception cases.

review: Approve

=== modified file 'src/server/input/android/input_sender.cpp'
--- src/server/input/android/input_sender.cpp	2015-12-18 09:13:03 +0000
+++ src/server/input/android/input_sender.cpp	2016-01-08 09:33:24 +0000
@@ -194,9 +194,10 @@
         subscribe();
         break;
     case droidinput::WOULD_BLOCK:
-        BOOST_THROW_EXCEPTION(boost::enable_error_info(std::runtime_error("Client input channel write blocked : ")) << boost::errinfo_errno(errno));
+        // Not an error. Clients are allowed to ignore input.
         break;
     case droidinput::DEAD_OBJECT:
+        // XXX This throw was recently added but is missing tests:
         BOOST_THROW_EXCEPTION(boost::enable_error_info(std::runtime_error("Client channel dead : ")) << boost::errinfo_errno(errno));
         break;
     default:

=== modified file 'tests/unit-tests/input/android/test_android_input_sender.cpp'
--- tests/unit-tests/input/android/test_android_input_sender.cpp	2015-12-18 09:35:01 +0000
+++ tests/unit-tests/input/android/test_android_input_sender.cpp	2016-01-08 09:33:24 +0000
@@ -271,6 +271,17 @@
     EXPECT_EQ(AINPUT_SOURCE_TOUCHSCREEN, client_motion_event.getSource());
 }
 
+TEST_F(AndroidInputSender, non_input_clients_dont_crash_the_server)
+{   // Regression test for LP: #1528438
+    register_surface();
+
+    EXPECT_NO_THROW(
+        {
+            for (int i = 0; i < 10000; ++i)
+                sender.send_event(*motion_event, channel);
+        });
+}
+
 TEST_F(AndroidInputSender, sends_pointer_events)
 {
     using namespace ::testing;