Mir

Merge lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration into lp:mir

fake-event-hub-to-fake-input-server-configuration
Merge into development-branch

Proposed by Andreas Pokorny on 2015-05-12

Status:	Work in progress
Proposed branch:	lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration
Merge into:	lp:mir
Prerequisite:	lp:~andreas-pokorny/mir/stub-legacy-input-dispatchable
Diff against target:	677 lines (+161/-117) 10 files modified benchmarks/frame-uniformity/touch_producing_server.cpp (+12/-10) benchmarks/frame-uniformity/touch_producing_server.h (+5/-2) src/server/input/default_input_manager.cpp (+35/-23) src/server/input/default_input_manager.h (+5/-2) tests/acceptance-tests/throwback/test_client_cursor_api.cpp (+15/-15) tests/include/mir_test_framework/fake_input_server_configuration.h (+12/-22) tests/integration-tests/input/test_cursor_listener.cpp (+2/-3) tests/integration-tests/test_server_shutdown.cpp (+59/-12) tests/mir_test_framework/CMakeLists.txt (+1/-1) tests/mir_test_framework/fake_input_server_configuration.cpp (+15/-27)
To merge this branch:	bzr merge lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-06-22
Alan Griffiths			Needs Fixing on 2015-05-28
Robert Carr (community)			Approve on 2015-05-19
Kevin DuBois (community)		2015-05-12	Needs Fixing on 2015-05-14
Review via email: mp+258845@code.launchpad.net

Commit message

Switch all tests to FakeInputServerConfiguration, and ensure that DefaultInputManagers dispatchables are unlinked from the MutliplexingDispatchable in all shutdown paths.

Description of the change

Change FakeEventHubServerConfiguration into FakeInputServerConfiguration - a server configuration that ensures that an input platform is loaded that can be used with fake input devices.

There were a few copies of FakeEventHubServerConfigration in the code, those were changed to. Hence the shutdown case: exception during user input processing was converted to. That required a cleanup of the DefaultInputManager 'stop' paths.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-12:

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

review: Needs Fixing (continuous-integration)

lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration updated on 2015-05-12

2369. By Andreas Pokorny on 2015-05-12: merge clang fix

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-12:

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

review: Approve (continuous-integration)

lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration updated on 2015-05-12

2370. By Andreas Pokorny on 2015-05-12: include not needed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-12:

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

review: Approve (continuous-integration)

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-05-14:

183+ for (auto const platform : platforms)
const&?

123+ if (!state.compare_exchange_strong(expected, State::running))
Close to my EOD (and my brain's somewhat cooked), but the existing code doesn't look threadsafe, and this could still have an interleaving of stop() and start(). I'd guess the start and stop need to be exclusive (maybe a 'start', 'stop' and 'transitioning' state could work). If its also not threadsafe now, could we leave it as is?

review: Needs Fixing

lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration updated on 2015-05-19

2371. By Andreas Pokorny on 2015-05-13: merge prereq
2372. By Andreas Pokorny on 2015-05-19: merge prereq
2373. By Andreas Pokorny on 2015-05-19: fixing missing ref

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-05-19:

> 123+ if (!state.compare_exchange_strong(expected, State::running))
> Close to my EOD (and my brain's somewhat cooked), but the existing code
> doesn't look threadsafe, and this could still have an interleaving of stop()
> and start(). I'd guess the start and stop need to be exclusive (maybe a
> 'start', 'stop' and 'transitioning' state could work). If its also not
> threadsafe now, could we leave it as is?

Yes it is not safe against interleaving start/stop calls. This change only helps against parallel stop calls.. Looking at the code again, it also lacks exception safety. I think I should bring it on par with the start/stop behavior of MultithreadedCompositor

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-19:

PASSED: Continuous integration, rev:2373
http://jenkins.qa.ubuntu.com/job/mir-ci/3873/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2479
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2479/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5353
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20610

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

review: Approve (continuous-integration)

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-05-19:

LGTM Besides the mentioned exception safety in start/stop.

review: Approve

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-05-28:

The only blocking issue I see is the exception safety.

~~~~

One nit:

89 + std::unique_ptr<mir_test_framework::FakeInputDevice> touch_screen;

const?

~~~~

One (pre-existing) wish:

359 std::shared_ptr<mir::input::InputManager> the_input_manager() override;
360 std::shared_ptr<mir::input::InputDispatcher> the_input_dispatcher() override;
...
362 std::shared_ptr<mir::input::InputSender> the_input_sender() override;

A shame these are needed but are not customization points in mir::Server (as that would go a long way to getting rid of these "throwback" tests).

review: Needs Fixing

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-05-29:

Uh, I nearly forgot about that branch.

> One (pre-existing) wish:
>
> 359 std::shared_ptr<mir::input::InputManager> the_input_manager()
> override;
> 360 std::shared_ptr<mir::input::InputDispatcher>
> the_input_dispatcher() override;
> ...
> 362 std::shared_ptr<mir::input::InputSender> the_input_sender()
> override;
>
> A shame these are needed but are not customization points in mir::Server (as
> that would go a long way to getting rid of these "throwback" tests).

I believe none of those three are touched in throwback. I think throwback could be cleaned if we add a customization point to track the scene contents (cursor + touch vizsualiation) and the used cursor buffers. Hmm the other remaining would be focus tracking.. We might get away by testing for focus events on the client?

lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration updated on 2015-05-29

2374. By Andreas Pokorny on 2015-05-22: merge lp:mir
2375. By Andreas Pokorny on 2015-05-29: merge lp:mir
2376. By Andreas Pokorny on 2015-05-29: nits fixed additional tear down on stop

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-05-29:

hm maybe my last change was unnecessary as unique_ptr should cover that case nicely..

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-29:

FAILED: Continuous integration, rev:2376
http://jenkins.qa.ubuntu.com/job/mir-ci/3946/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/141
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2578/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/102/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2578
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2578/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5429/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20841

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

review: Needs Fixing (continuous-integration)

lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration updated on 2015-05-30

2377. By Andreas Pokorny on 2015-05-30: revert additional stack unwinding code

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-05-30:

PASSED: Continuous integration, rev:2377
http://jenkins.qa.ubuntu.com/job/mir-ci/3953/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2586
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2586/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5436
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20850

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

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-06-01:

> > One (pre-existing) wish:
> >
> > 359 std::shared_ptr<mir::input::InputManager> the_input_manager()
> > override;
> > 360 std::shared_ptr<mir::input::InputDispatcher>
> > the_input_dispatcher() override;
> > ...
> > 362 std::shared_ptr<mir::input::InputSender> the_input_sender()
> > override;
>
> I believe none of those three are touched in throwback. I think throwback
> could be cleaned if we add a customization point to track the scene contents
> (cursor + touch vizsualiation) and the used cursor buffers. Hmm the other
> remaining would be focus tracking.. We might get away by testing for focus
> events on the client?

You say they are "not touched" but the tests use this configuration and this configuration implements these overrides. So touched or not they are used.

Revision history for this message

Kevin DuBois (kdub) wrote on 2015-06-02:

Especially given that start/stop isn't on a critical path, guarding against interleaving start/stop calls seems like something thats easy to do with a mutex... but if that's not the goal, it seems okay to guard against many stop() or start() calls this way. So I guess still needs fixing on the exception safety.

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2015-06-10:

So..is this work in progress? Or still needs review?

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-06-11:

> So..is this work in progress? Or still needs review?

"Needs fixing" on the exception safety.

lp:~andreas-pokorny/mir/fake-event-hub-to-fake-input-server-configuration updated on 2015-06-22

2378. By Andreas Pokorny on 2015-06-21: merged lp:mir
2379. By Andreas Pokorny on 2015-06-22: Mutually exclude multiple start and stop executions

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-22:

PASSED: Continuous integration, rev:2379
http://jenkins.qa.ubuntu.com/job/mir-ci/4165/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2948
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/321
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2896
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2896/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5720
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21371

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

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2015-06-23:

Am I missing something?

AFAICS this has been blocked for four weeks over on the same issue (exception safety) and the latest revision does not address this.

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2015-06-23:

> Am I missing something?
>
> AFAICS this has been blocked for four weeks over on the same issue (exception
> safety) and the latest revision does not address this.

No you are not. I returned to the branch today.. and I am still on it.

Unmerged revisions

2379. By Andreas Pokorny on 2015-06-22: Mutually exclude multiple start and stop executions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andreas Pokorny

Emanuele Antonio Faraone

Gerry Boland

Mir development team

 === modified file 'benchmarks/frame-uniformity/touch_producing_server.cpp'
 --- benchmarks/frame-uniformity/touch_producing_server.cpp	2015-04-28 07:54:10 +0000
 +++ benchmarks/frame-uniformity/touch_producing_server.cpp	2015-06-22 19:27:32 +0000
@@ -18,9 +18,10 @@
  #include "touch_producing_server.h"
  #include "vsync_simulating_graphics_platform.h"
++#include "mir/input/input_device_info.h"
  #include "mir_test/event_factory.h"
--#include "mir_test/fake_event_hub.h"
++#include "mir_test_framework/stub_server_platform_factory.h"
  #include "mir/geometry/displacement.h"
  #include <functional>
@@ -37,15 +38,17 @@
  TouchProducingServer::TouchProducingServer(geom::Rectangle screen_dimensions, geom::Point touch_start,
      geom::Point touch_end, std::chrono::high_resolution_clock::duration touch_duration,
      mt::Barrier &client_ready)
--    : FakeEventHubServerConfiguration({screen_dimensions}),
++    : FakeInputServerConfiguration({screen_dimensions}),
        screen_dimensions(screen_dimensions),
        touch_start(touch_start),
        touch_end(touch_end),
        touch_duration(touch_duration),
--      client_ready(client_ready)
++      client_ready(client_ready),
++      touch_screen(mtf::add_fake_input_device(mi::InputDeviceInfo{
++                                              0, "touch screen", "touch-screen-uid", mi::DeviceCapability::touchscreen | mi::DeviceCapability::multitouch}))
+ {
      input_injection_thread = std::thread(std::mem_fn(&TouchProducingServer::thread_function), this);
--}
++}
  TouchProducingServer::~TouchProducingServer()
+ {
@@ -66,18 +69,17 @@
  void TouchProducingServer::synthesize_event_at(geom::Point const& point)
+ {
--    auto const minimum_touch = mia::FakeEventHub::TouchScreenMinAxisValue;
--    auto const maximum_touch = mia::FakeEventHub::TouchScreenMaxAxisValue;
++    auto const minimum_touch = mtf::FakeInputDevice::minimum_touch_axis_value;
++    auto const maximum_touch = mtf::FakeInputDevice::maximum_touch_axis_value;
      auto const display_width = screen_dimensions.size.width.as_int();
      auto const display_height = screen_dimensions.size.height.as_int();
--
++
      auto px_frac = point.x.as_int() / static_cast<double>(display_width);
      auto py_frac = point.y.as_int() / static_cast<double>(display_height);
      auto const abs_touch_x = minimum_touch + (maximum_touch-minimum_touch) * px_frac;
      auto const abs_touch_y = minimum_touch + (maximum_touch-minimum_touch) * py_frac;
--
--    fake_event_hub->synthesize_event(
--        mis::a_touch_event().at_position({abs_touch_x, abs_touch_y}));
++
++    touch_screen->emit_event(mis::a_touch_event().at_position({abs_touch_x, abs_touch_y}));
+ }
  void TouchProducingServer::thread_function()
 === modified file 'benchmarks/frame-uniformity/touch_producing_server.h'
 --- benchmarks/frame-uniformity/touch_producing_server.h	2014-10-22 19:27:20 +0000
 +++ benchmarks/frame-uniformity/touch_producing_server.h	2015-06-22 19:27:32 +0000
@@ -19,7 +19,8 @@
  #ifndef TOUCH_PRODUCING_SERVER_H_
  #define TOUCH_PRODUCING_SERVER_H_
--#include "mir_test_framework/fake_event_hub_server_configuration.h"
++#include "mir_test_framework/fake_input_server_configuration.h"
++#include "mir_test_framework/fake_input_device.h"
  #include "mir_test/barrier.h"
  #include "mir/geometry/rectangle.h"
@@ -27,7 +28,7 @@
  #include <thread>
--class TouchProducingServer : public mir_test_framework::FakeEventHubServerConfiguration
++class TouchProducingServer : public mir_test_framework::FakeInputServerConfiguration
+ {
  public:
      TouchProducingServer(mir::geometry::Rectangle screen_dimensions, mir::geometry::Point touch_start, mir::geometry::Point touch_end, std::chrono::high_resolution_clock::duration touch_duration, mir::test::Barrier& client_ready);
@@ -59,6 +60,8 @@
      void synthesize_event_at(mir::geometry::Point const& point);
      void thread_function();
++
++    std::unique_ptr<mir_test_framework::FakeInputDevice> const touch_screen;
  };
  #endif
 === modified file 'src/server/input/default_input_manager.cpp'
 --- src/server/input/default_input_manager.cpp	2015-06-17 05:20:42 +0000
 +++ src/server/input/default_input_manager.cpp	2015-06-22 19:27:32 +0000
@@ -29,16 +29,14 @@
  #include "mir/thread_name.h"
  #include "mir/terminate_with_current_exception.h"
--#include <condition_variable>
--#include <mutex>
  #include <future>
  namespace mi = mir::input;
--namespace mia = mi::android;
  mi::DefaultInputManager::DefaultInputManager(std::shared_ptr<dispatch::MultiplexingDispatchable> const& multiplexer,
--                                             std::shared_ptr<LegacyInputDispatchable>  const& legacy_dispatchable)
--    : multiplexer{multiplexer}, legacy_dispatchable{legacy_dispatchable}, queue{std::make_shared<mir::dispatch::ActionQueue>()}, state{State::stopped}
++                                             std::shared_ptr<LegacyInputDispatchable> const& legacy_dispatchable)
++    : multiplexer{multiplexer}, legacy_dispatchable{legacy_dispatchable},
++      queue{std::make_shared<mir::dispatch::ActionQueue>()}, state{State::stopped}
+ {
+ }
@@ -70,6 +68,8 @@
  void mi::DefaultInputManager::start()
+ {
++    std::unique_lock<std::mutex> start_guard(start_stop_exclusion);
++
      if (state == State::running)
          return;
@@ -103,6 +103,9 @@
          multiplexer,
          [this,weak_started_promise]()
+         {
++            unregister_dispatchables();
++            stop_platforms();
++
              state = State::stopped;
              if (auto started_promise = weak_started_promise.lock())
                  started_promise->set_exception(std::current_exception());
@@ -114,30 +117,39 @@
  void mi::DefaultInputManager::stop()
+ {
++    std::unique_lock<std::mutex> start_guard(start_stop_exclusion);
++
      if (state == State::stopped)
          return;
--    std::mutex m;
--    std::unique_lock<std::mutex> lock(m);
--    std::condition_variable cv;
--    bool done = false;
--
--    queue->enqueue([&]()
--                   {
--                       for (auto const platform : platforms)
--                       {
--                           multiplexer->remove_watch(platform->dispatchable());
--                           platform->stop();
--                       }
--
--                       std::unique_lock<std::mutex> lock(m);
--                       done = true;
--                       cv.notify_one();
--                   });
--    cv.wait(lock, [&]{return done;});
++
      state = State::stopped;
++    auto const stop_promise = std::make_shared<std::promise<void>>();
++
++    queue->enqueue([stop_promise,this]()
++                   {
++                       stop_platforms();
++
++                       stop_promise->set_value();
++                   });
++
++    stop_promise->get_future().wait();
      input_thread.reset();
++    unregister_dispatchables();
++}
++
++void mi::DefaultInputManager::stop_platforms()
++{
++    for (auto const& platform : platforms)
++    {
++        multiplexer->remove_watch(platform->dispatchable());
++        platform->stop();
++    }
++}
++
++void mi::DefaultInputManager::unregister_dispatchables()
++{
      multiplexer->remove_watch(legacy_dispatchable);
      multiplexer->remove_watch(queue);
+ }
 === modified file 'src/server/input/default_input_manager.h'
 --- src/server/input/default_input_manager.h	2015-06-17 05:20:42 +0000
 +++ src/server/input/default_input_manager.h	2015-06-22 19:27:32 +0000
@@ -23,7 +23,7 @@
  #include <vector>
  #include <thread>
--#include <atomic>
++#include <mutex>
  namespace mir
+ {
@@ -50,6 +50,8 @@
      void start() override;
      void stop() override;
  private:
++    void stop_platforms();
++    void unregister_dispatchables();
      std::vector<std::shared_ptr<Platform>> platforms;
      std::shared_ptr<dispatch::MultiplexingDispatchable> const multiplexer;
      std::shared_ptr<input::LegacyInputDispatchable> const legacy_dispatchable;
@@ -60,7 +62,8 @@
+     {
          running, stopped
      };
--    std::atomic<State> state;
++    State state;
++    std::mutex start_stop_exclusion;
  };
+ }
 === modified file 'tests/acceptance-tests/throwback/test_client_cursor_api.cpp'
 --- tests/acceptance-tests/throwback/test_client_cursor_api.cpp	2015-06-17 15:19:52 +0000
 +++ tests/acceptance-tests/throwback/test_client_cursor_api.cpp	2015-06-22 19:27:32 +0000
@@ -20,12 +20,14 @@
  #include "mir/graphics/cursor.h"
  #include "mir/graphics/cursor_image.h"
  #include "mir/input/cursor_images.h"
++#include "mir/input/input_device_info.h"
  #include "mir/shell/canonical_window_manager.h"
  #include "mir/scene/placement_strategy.h"
--
  #include "mir_test_framework/in_process_server.h"
--#include "mir_test_framework/fake_event_hub_server_configuration.h"
++#include "mir_test_framework/fake_input_device.h"
++#include "mir_test_framework/stub_server_platform_factory.h"
++#include "mir_test_framework/fake_input_server_configuration.h"
  #include "mir_test_framework/declarative_placement_strategy.h"
  #include "mir_test_framework/using_stub_client_platform.h"
  #include "mir_test_framework/headless_nested_server_runner.h"
@@ -34,7 +36,6 @@
  #include "mir_test/fake_shared.h"
  #include "mir_test/spin_wait.h"
  #include "mir_test/wait_condition.h"
--#include "mir_test/fake_event_hub.h"
  #include "mir_toolkit/mir_client_library.h"
@@ -239,7 +240,7 @@
      std::shared_ptr<ms::PlacementStrategy> const placement_strategy;
  };
--struct TestServerConfiguration : mtf::FakeEventHubServerConfiguration
++struct TestServerConfiguration : mtf::FakeInputServerConfiguration
+ {
      std::shared_ptr<mir::scene::PlacementStrategy> the_placement_strategy()
+     {
@@ -292,11 +293,6 @@
          return server_configuration_;
+     }
--    std::shared_ptr<mir::input::android::FakeEventHub> fake_event_hub()
--    {
--        return server_configuration_.fake_event_hub;
--    }
--
      void expect_client_shutdown()
+     {
          using namespace testing;
@@ -316,6 +312,10 @@
      mir::test::WaitCondition expectations_satisfied;
      mtf::UsingStubClientPlatform using_stub_client_platform;
++    std::unique_ptr<mtf::FakeInputDevice> fake_mouse{
++        mtf::add_fake_input_device(mi::InputDeviceInfo{ 0, "mouse", "mouse-uid" , mi::DeviceCapability::pointer})
++        };
++
      ::testing::NiceMock<mtd::MockEGL> mock_egl;
  };
@@ -337,7 +337,7 @@
      EXPECT_CALL(test_server_config().cursor, hide())
          .WillOnce(mt::WakeUp(&expectations_satisfied));
--    fake_event_hub()->synthesize_event(mis::a_pointer_event().with_movement(1, 0));
++    fake_mouse->emit_event(mis::a_pointer_event().with_movement(1, 0));
      expectations_satisfied.wait_for_at_most_seconds(5);
@@ -359,8 +359,8 @@
      EXPECT_CALL(test_server_config().cursor, show(DefaultCursorImage()))
          .WillOnce(mt::WakeUp(&expectations_satisfied));
--    fake_event_hub()->synthesize_event(mis::a_pointer_event().with_movement(1, 0));
--    fake_event_hub()->synthesize_event(mis::a_pointer_event().with_movement(2, 0));
++    fake_mouse->emit_event(mis::a_pointer_event().with_movement(1, 0));
++    fake_mouse->emit_event(mis::a_pointer_event().with_movement(2, 0));
      expectations_satisfied.wait_for_at_most_seconds(5);
@@ -386,8 +386,8 @@
      EXPECT_CALL(test_server_config().cursor, show(CursorNamed(client_cursor_2)))
          .WillOnce(mt::WakeUp(&expectations_satisfied));
--    fake_event_hub()->synthesize_event(mis::a_pointer_event().with_movement(1, 0));
--    fake_event_hub()->synthesize_event(mis::a_pointer_event().with_movement(1, 0));
++    fake_mouse->emit_event(mis::a_pointer_event().with_movement(1, 0));
++    fake_mouse->emit_event(mis::a_pointer_event().with_movement(1, 0));
      expectations_satisfied.wait_for_at_most_seconds(5);
@@ -411,7 +411,7 @@
      EXPECT_CALL(test_server_config().cursor, show(CursorNamed(client_cursor_2)))
          .WillOnce(mt::WakeUp(&expectations_satisfied));
--    fake_event_hub()->synthesize_event(mis::a_pointer_event().with_movement(1, 0));
++    fake_mouse->emit_event(mis::a_pointer_event().with_movement(1, 0));
      expectations_satisfied.wait_for_at_most_seconds(5);
 === renamed file 'tests/include/mir_test_framework/fake_event_hub_server_configuration.h' => 'tests/include/mir_test_framework/fake_input_server_configuration.h'
 --- tests/include/mir_test_framework/fake_event_hub_server_configuration.h	2015-06-17 15:19:52 +0000
 +++ tests/include/mir_test_framework/fake_input_server_configuration.h	2015-06-22 19:27:32 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright © 2013-2014 Canonical Ltd.
++ * Copyright © 2013-2015 Canonical Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 3,
@@ -17,41 +17,31 @@
   *              Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#ifndef MIR_TEST_FAKE_EVENT_HUB_SERVER_CONFIGURATION_H_
--#define MIR_TEST_FAKE_EVENT_HUB_SERVER_CONFIGURATION_H_
++#ifndef MIR_TEST_FAKE_INPUT_SERVER_CONFIGURATION_H_
++#define MIR_TEST_FAKE_INPUT_SERVER_CONFIGURATION_H_
  #include "mir_test_framework/testing_server_configuration.h"
--
--namespace mir
--{
--namespace input
--{
--namespace android
--{
--class FakeEventHub;
--}
--}
--}
++#include "mir_test_framework/temporary_environment_value.h"
++#include "mir_test_framework/executable_path.h"
  namespace mir_test_framework
+ {
--class FakeEventHubServerConfiguration : public TestingServerConfiguration
++class FakeInputServerConfiguration : public TestingServerConfiguration
+ {
  public:
--    using TestingServerConfiguration::TestingServerConfiguration;
++    FakeInputServerConfiguration();
++    FakeInputServerConfiguration(std::vector<mir::geometry::Rectangle> const& display_rects);
--    std::shared_ptr<droidinput::EventHubInterface> the_event_hub() override;
      std::shared_ptr<mir::input::InputManager> the_input_manager() override;
      std::shared_ptr<mir::input::InputDispatcher> the_input_dispatcher() override;
++    std::shared_ptr<mir::input::LegacyInputDispatchable> the_legacy_input_dispatchable() override;
      std::shared_ptr<mir::shell::InputTargeter> the_input_targeter() override;
      std::shared_ptr<mir::input::InputSender> the_input_sender() override;
--    std::shared_ptr<mir::input::LegacyInputDispatchable> the_legacy_input_dispatchable() override;
--    std::shared_ptr<mir::input::android::FakeEventHub> the_fake_event_hub();
--
--    std::shared_ptr<mir::input::android::FakeEventHub> fake_event_hub;
++private:
++    TemporaryEnvironmentValue input_lib{"MIR_SERVER_PLATFORM_INPUT_LIB", server_platform("input-stub.so").c_str()};
  };
+ }
--#endif /* MIR_TEST_FAKE_EVENT_HUB_SERVER_CONFIGURATION_H_ */
++#endif /* MIR_TEST_FAKE_INPUT_SERVER_CONFIGURATION_H_ */
 === modified file 'tests/integration-tests/input/test_cursor_listener.cpp'
 --- tests/integration-tests/input/test_cursor_listener.cpp	2015-06-17 05:20:42 +0000
 +++ tests/integration-tests/input/test_cursor_listener.cpp	2015-06-22 19:27:32 +0000
@@ -21,7 +21,7 @@
  #include "mir_test/fake_shared.h"
  #include "mir_test_framework/fake_input_device.h"
--#include "mir_test_framework/stubbed_server_configuration.h"
++#include "mir_test_framework/fake_input_server_configuration.h"
  #include "mir_test_framework/stub_server_platform_factory.h"
  #include "mir_test_framework/temporary_environment_value.h"
  #include "mir_test_doubles/stub_input_enumerator.h"
@@ -57,13 +57,12 @@
      ~MockCursorListener() noexcept {}
  };
--struct CursorListenerIntegrationTest : testing::Test, mtf::StubbedServerConfiguration
++struct CursorListenerIntegrationTest : testing::Test, mtf::FakeInputServerConfiguration
+ {
      mtf::TemporaryEnvironmentValue input_lib{"MIR_SERVER_PLATFORM_INPUT_LIB", mtf::server_platform("input-stub.so").c_str()};
      mtf::TemporaryEnvironmentValue real_input{"MIR_SERVER_TESTS_USE_REAL_INPUT", "1"};
      mtf::TemporaryEnvironmentValue no_key_repeat{"MIR_SERVER_ENABLE_KEY_REPEAT", "0"};
--
      std::shared_ptr<mi::CursorListener> the_cursor_listener() override
+     {
          return mt::fake_shared(cursor_listener);
 === modified file 'tests/integration-tests/test_server_shutdown.cpp'
 --- tests/integration-tests/test_server_shutdown.cpp	2015-06-17 05:20:42 +0000
 +++ tests/integration-tests/test_server_shutdown.cpp	2015-06-22 19:27:32 +0000
@@ -21,9 +21,11 @@
  #include "mir/run_mir.h"
  #include "mir/main_loop.h"
++#include "mir_toolkit/mir_client_library.h"
++
++#include "mir_test_framework/fake_input_server_configuration.h"
  #include "mir_test_framework/any_surface.h"
--#include "mir_test_framework/fake_event_hub_server_configuration.h"
--#include "mir_test_framework/fake_event_hub_server_configuration.h"
++#include "mir_test_framework/fake_input_server_configuration.h"
  #include "mir_test_framework/server_runner.h"
  #include "mir_test_framework/testing_server_configuration.h"
  #include "mir_test_framework/using_stub_client_platform.h"
@@ -31,8 +33,14 @@
  #include "mir_test_doubles/null_display_buffer_compositor_factory.h"
  #include "mir_test_doubles/stub_frame_dropping_policy_factory.h"
++#include "mir_test_doubles/stub_renderer.h"
  #include "mir_test/fake_event_hub.h"
++#include "mir/dispatch/action_queue.h"
++#include "mir/input/input_device.h"
++#include "mir/input/input_device_info.h"
++#include "mir/input/input_device_registry.h"
++
  #include "mir_toolkit/mir_client_library.h"
  #include <gtest/gtest.h>
@@ -41,6 +49,7 @@
  namespace mtd = mir::test::doubles;
  namespace mc = mir::compositor;
  namespace mg = mir::graphics;
++namespace mi = mir::input;
  namespace
+ {
@@ -159,7 +168,7 @@
      std::weak_ptr<mir::graphics::Display> display = server_configuration->the_display();
      std::weak_ptr<mir::compositor::Compositor> compositor = server_configuration->the_compositor();
      std::weak_ptr<mir::frontend::Connector> connector = server_configuration->the_connector();
--    std::weak_ptr<mir::input::InputManager> input_manager = server_configuration->the_input_manager();
++    std::weak_ptr<mi::InputManager> input_manager = server_configuration->the_input_manager();
      server_configuration.reset();
@@ -191,6 +200,35 @@
+     }
  };
++struct ThrowingInputDevice : mi::InputDevice
++{
++    ThrowingInputDevice()
++        : queue{std::make_shared<mir::dispatch::ActionQueue>()}
++    {
++    }
++
++    std::shared_ptr<mir::dispatch::Dispatchable> dispatchable() override
++    {
++        return queue;
++    }
++    void start(mi::InputSink*) override
++    {
++        queue->enqueue([](){throw std::runtime_error("InputDevice dispatch exception");});
++    }
++    void stop() override
++    {
++    }
++
++    mi::InputDeviceInfo get_device_info() override
++    {
++        return info;
++    }
++
++
++    mi::InputDeviceInfo info{0, "keyboard", "keyboard-uid", mi::DeviceCapability::keyboard};
++    std::shared_ptr<mir::dispatch::ActionQueue> queue;
++};
++
+ }
  TEST(ServerShutdownWithThreadException,
@@ -224,7 +262,8 @@
      std::weak_ptr<mir::graphics::Display> display = server_config->the_display();
      std::weak_ptr<mir::compositor::Compositor> compositor = server_config->the_compositor();
      std::weak_ptr<mir::frontend::Connector> connector = server_config->the_connector();
--    std::weak_ptr<mir::input::InputManager> input_manager = server_config->the_input_manager();
++    std::weak_ptr<mi::InputManager> input_manager = server_config->the_input_manager();
++    std::weak_ptr<mi::InputDeviceHub> hub = server_config->the_input_device_hub();
      server_config.reset();
@@ -232,13 +271,16 @@
      EXPECT_EQ(0, compositor.use_count());
      EXPECT_EQ(0, connector.use_count());
      EXPECT_EQ(0, input_manager.use_count());
++    EXPECT_EQ(0, hub.use_count());
+ }
  TEST(ServerShutdownWithThreadException,
       server_releases_resources_on_abnormal_input_thread_termination)
+ {
--    auto server_config = std::make_shared<mtf::FakeEventHubServerConfiguration>();
--    auto fake_event_hub = server_config->the_fake_event_hub();
++    auto server_config = std::make_shared<mtf::FakeInputServerConfiguration>();
++    auto dev = std::make_shared<ThrowingInputDevice>();
++    std::weak_ptr<ThrowingInputDevice> weak_dev = dev;
++    auto device_registry = server_config->the_input_device_registry();
      std::thread server{
          [&server_config]
@@ -248,13 +290,16 @@
                  std::runtime_error);
          }};
--    fake_event_hub->throw_exception_in_next_get_events();
++    device_registry->add_device(dev);
      server.join();
++    dev.reset();
++    device_registry.reset();
      std::weak_ptr<mir::graphics::Display> display = server_config->the_display();
      std::weak_ptr<mir::compositor::Compositor> compositor = server_config->the_compositor();
      std::weak_ptr<mir::frontend::Connector> connector = server_config->the_connector();
--    std::weak_ptr<mir::input::InputManager> input_manager = server_config->the_input_manager();
++    std::weak_ptr<mi::InputManager> input_manager = server_config->the_input_manager();
++    std::weak_ptr<mi::InputDeviceHub> hub = server_config->the_input_device_hub();
      server_config.reset();
@@ -262,15 +307,15 @@
      EXPECT_EQ(0, compositor.use_count());
      EXPECT_EQ(0, connector.use_count());
      EXPECT_EQ(0, input_manager.use_count());
++    EXPECT_EQ(0, hub.use_count());
+ }
  // This also acts as a regression test for LP: #1378740
  TEST(ServerShutdownWithThreadException,
       server_releases_resources_on_abnormal_main_thread_termination)
+ {
--    // Use the FakeEventHubServerConfiguration to get the production input components
--    // (with the exception of EventHub, of course).
--    auto server_config = std::make_shared<mtf::FakeEventHubServerConfiguration>();
++    // Use the FakeInputServerConfiguration to get the production input components
++    auto server_config = std::make_shared<mtf::FakeInputServerConfiguration>();
      std::thread server{
          [&]
@@ -291,7 +336,8 @@
      std::weak_ptr<mir::graphics::Display> display = server_config->the_display();
      std::weak_ptr<mir::compositor::Compositor> compositor = server_config->the_compositor();
      std::weak_ptr<mir::frontend::Connector> connector = server_config->the_connector();
--    std::weak_ptr<mir::input::InputManager> input_manager = server_config->the_input_manager();
++    std::weak_ptr<mi::InputManager> input_manager = server_config->the_input_manager();
++    std::weak_ptr<mi::InputDeviceHub> hub = server_config->the_input_device_hub();
      server_config.reset();
@@ -299,4 +345,5 @@
      EXPECT_EQ(0, compositor.use_count());
      EXPECT_EQ(0, connector.use_count());
      EXPECT_EQ(0, input_manager.use_count());
++    EXPECT_EQ(0, hub.use_count());
+ }
 === modified file 'tests/mir_test_framework/CMakeLists.txt'
 --- tests/mir_test_framework/CMakeLists.txt	2015-06-17 05:20:42 +0000
 +++ tests/mir_test_framework/CMakeLists.txt	2015-06-22 19:27:32 +0000
@@ -42,7 +42,7 @@
    stub_server_platform_factory.cpp
    udev_environment.cpp
    declarative_placement_strategy.cpp
--  fake_event_hub_server_configuration.cpp
++  fake_input_server_configuration.cpp
    any_surface.cpp
    headless_nested_server_runner.cpp
    placement_applying_shell.cpp
 === renamed file 'tests/mir_test_framework/fake_event_hub_server_configuration.cpp' => 'tests/mir_test_framework/fake_input_server_configuration.cpp'
 --- tests/mir_test_framework/fake_event_hub_server_configuration.cpp	2015-06-17 15:19:52 +0000
 +++ tests/mir_test_framework/fake_input_server_configuration.cpp	2015-06-22 19:27:32 +0000
@@ -17,9 +17,7 @@
   *              Alexandros Frantzis <alexandros.frantzis@canonical.com>
   */
--#include "mir_test_framework/fake_event_hub_server_configuration.h"
--
--#include "mir_test/fake_event_hub.h"
++#include "mir_test_framework/fake_input_server_configuration.h"
  namespace mtf = mir_test_framework;
  namespace mi = mir::input;
@@ -27,47 +25,37 @@
  namespace msh = mir::shell;
  namespace mia = mir::input::android;
--std::shared_ptr<mi::InputManager> mtf::FakeEventHubServerConfiguration::the_input_manager()
++mtf::FakeInputServerConfiguration::FakeInputServerConfiguration()
++{
++}
++
++mtf::FakeInputServerConfiguration::FakeInputServerConfiguration(std::vector<mir::geometry::Rectangle> const& display_rects)
++    : TestingServerConfiguration(display_rects)
++{
++}
++
++std::shared_ptr<mi::InputManager> mtf::FakeInputServerConfiguration::the_input_manager()
+ {
      return DefaultServerConfiguration::the_input_manager();
+ }
--std::shared_ptr<msh::InputTargeter> mtf::FakeEventHubServerConfiguration::the_input_targeter()
++std::shared_ptr<msh::InputTargeter> mtf::FakeInputServerConfiguration::the_input_targeter()
+ {
      return DefaultServerConfiguration::the_input_targeter();
+ }
--std::shared_ptr<mi::InputDispatcher> mtf::FakeEventHubServerConfiguration::the_input_dispatcher()
++std::shared_ptr<mi::InputDispatcher> mtf::FakeInputServerConfiguration::the_input_dispatcher()
+ {
      return DefaultServerConfiguration::the_input_dispatcher();
+ }
--std::shared_ptr<mi::InputSender> mtf::FakeEventHubServerConfiguration::the_input_sender()
++std::shared_ptr<mi::InputSender> mtf::FakeInputServerConfiguration::the_input_sender()
+ {
      return DefaultServerConfiguration::the_input_sender();
+ }
--std::shared_ptr<mi::LegacyInputDispatchable> mtf::FakeEventHubServerConfiguration::the_legacy_input_dispatchable()
++std::shared_ptr<mi::LegacyInputDispatchable> mtf::FakeInputServerConfiguration::the_legacy_input_dispatchable()
+ {
      return DefaultServerConfiguration::the_legacy_input_dispatchable();
+ }
--std::shared_ptr<droidinput::EventHubInterface> mtf::FakeEventHubServerConfiguration::the_event_hub()
--{
--    return the_fake_event_hub();
--}
--
--std::shared_ptr<mia::FakeEventHub> mtf::FakeEventHubServerConfiguration::the_fake_event_hub()
--{
--    if (!fake_event_hub)
--    {
--        fake_event_hub = std::make_shared<mia::FakeEventHub>();
--
--        fake_event_hub->synthesize_builtin_keyboard_added();
--        fake_event_hub->synthesize_builtin_cursor_added();
--        fake_event_hub->synthesize_usb_touchscreen_added();
--        fake_event_hub->synthesize_device_scan_complete();
--    }
--
--    return fake_event_hub;
--}