Merge lp:~robertcarr/mir/input-lttng into lp:~mir-team/mir/trunk

[Robert Carr]

Demote old input logs to a legacy report. Replace with a new InputReport interface and both logging and LTTNG based implementations.

This branch starts to gather some useful input statistics through input-lttng.

The old input log is demoted to a LegacyInputReport.

A new InputReport interface is created.

Logger and lttng implementations are provided.

Unfortunately I am unable to make lttng work (with both the existing message processor report and my new report) so I haven't been able to confirm the output. Logging works fine of course.

Need to sync in morning on how to fix lttng!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:711
http://jenkins.qa.ubuntu.com/job/mir-ci/634/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/767/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/649/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/119/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:712
http://jenkins.qa.ubuntu.com/job/mir-ci/635/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/345

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

> Unfortunately I am unable to make lttng work (with both the existing message processor
> report and my new report) so I haven't been able to confirm the output

Did you follow the instructions in HACKING.md (especially the LD_PRELOAD note)?

984 +protected:
985 + InputReport() = default;
986 +
987 +private:
988 + InputReport(InputReport const&) = delete;
989 + InputReport& operator=(InputReport const&) = delete;

The preferred form is to make the deleted copy constructor and assignment operator protected too, for compactness.

1043 + protected:
1044 + NullInputReport(NullInputReport const&) = delete;
1045 + NullInputReport& operator=(NullInputReport const&) = delete;

1088 +protected:
1089 + InputReport(InputReport const&) = delete;
1090 + InputReport& operator=(InputReport const&) = delete;

There is no need to repeat the deletions, they are enforced by the base class.

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

> > Unfortunately I am unable to make lttng work (with both the existing message
> processor
> > report and my new report) so I haven't been able to confirm the output
>
> Did you follow the instructions in HACKING.md (especially the LD_PRELOAD
> note)?

libmirserverlttng.so no longer seems to be work for me too.

vis:

$ lttng create mirsession -o /tmp/mirsession
Session mirsession created.
Traces will be written in /tmp/mirsession
$ lttng enable-event -u -a
All UST events are enabled in channel channel0
$ lttng start
Tracing started for session mirsession
$ LD_PRELOAD=./lib/libmirserverlttng.so bin/integration-tests
...
[ FAILED ] 13 tests, listed below:
[ FAILED ] SurfaceLoop.creating_a_client_surface_allocates_buffer_swapper_on_server
[ FAILED ] SurfaceLoop.creating_a_client_surface_allocates_buffers_on_server
[ FAILED ] SurfaceLoop.all_created_buffers_are_destoyed
[ FAILED ] SurfaceLoop.all_created_buffers_are_destoyed_if_client_disconnects_without_releasing_surfaces
[ FAILED ] ErrorReporting.c_api_returns_error
[ FAILED ] BespokeDisplayServerTestFixture.display_info_reaches_client
[ FAILED ] BespokeDisplayServerTestFixture.starting_display_server_starts_input_manager
[ FAILED ] SurfaceFirstFrameSync.surface_not_rendered_until_buffer_is_pushed
[ FAILED ] ApplicationMediatorReport.session_connect_called
[ FAILED ] ApplicationMediatorReport.session_create_surface_called
[ FAILED ] ApplicationMediatorReport.session_next_buffer_called
[ FAILED ] ApplicationMediatorReport.session_release_surface_called
[ FAILED ] ApplicationMediatorReport.session_disconnect_called

13 FAILED TESTS

[Alan Griffiths (alan-griffiths)]

Oops:

> $ LD_PRELOAD=./lib/libmirserverlttng.so bin/integration-tests

that should be:

$ LD_PRELOAD=./lib/libmirserverlttng.so:liblttng-ust-fork.so bin/integration-tests

[Alan Griffiths (alan-griffiths)]

25 + ${PROJECT_SOURCE_DIR}/include/server

It doesn't seem right for 3rd_party code to depend on mir code.

The status of the forked "android" input is odd - I suspect it should move out of 3rd_party (it isn't as though we'll ever try to puck up the latest version after all the changes we've applied).

~~~~

+1 on Alexandros's comments about deleting CopyAssign

review: Needs Fixing

[Robert Carr (robertcarr)]

Lttng works for me with the LD_PRELOAD. Thanks!

Removed the extra copy assign.

[Robert Carr (robertcarr)]

>> 25 + ${PROJECT_SOURCE_DIR}/include/server
>> It doesn't seem right for 3rd_party code to depend on mir code.
>> The status of the forked "android" input is odd - I suspect it should move out of 3rd_party (it isn't as
 >> though we'll ever try to puck up the latest version after all the changes we've applied).

It doesn't seem right but also doesn't feel like a huge priority to move. I would like to come to some sort of decision about the input stack trajectory though. (Feels pretty forked).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:713
http://jenkins.qa.ubuntu.com/job/mir-ci/640/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/125/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

Nit:

1031 + NullInputReport() = default;
1032 + virtual ~NullInputReport() noexcept(true) = default;

1073 + virtual ~InputReport() noexcept(true) = default;

Is there a real need for these?

review: Approve

[Alexandros Frantzis (afrantzis)]

1127 + InputReport() = default;
1128 + virtual ~InputReport() noexcept(true) = default;

These, too.

[Alan Griffiths (alan-griffiths)]

Yeah, as Alexandros notes there's some overly verbose text - but nothing worth blocking on.

review: Approve

=== modified file '3rd_party/android-input/CMakeLists.txt'
--- 3rd_party/android-input/CMakeLists.txt	2013-02-11 12:50:00 +0000
+++ 3rd_party/android-input/CMakeLists.txt	2013-05-29 14:16:28 +0000
@@ -13,11 +13,6 @@
 
 add_subdirectory(android)
 
-#we don't have these tools dependencies hybrisized to build the tool
-if(MIR_PLATFORM STREQUAL "gbm")
-  add_subdirectory(tools)
-endif()
-
 # Make those include directories available to mir source code
 list(
   APPEND MIR_ANDROID_INCLUDE_DIRECTORIES

=== modified file '3rd_party/android-input/android/CMakeLists.txt'
--- 3rd_party/android-input/android/CMakeLists.txt	2013-05-04 00:53:42 +0000
+++ 3rd_party/android-input/android/CMakeLists.txt	2013-05-29 14:16:28 +0000
@@ -5,6 +5,8 @@
   hardware/libhardware_legacy/include
   system/core/include
   system/extras/ext4_utils
+
+  ${PROJECT_SOURCE_DIR}/include/server
 )
 
 add_definitions(
@@ -28,7 +30,6 @@
   frameworks/base/services/input/InputApplication.cpp
   frameworks/base/services/input/InputDispatcher.cpp
   frameworks/base/services/input/InputListener.cpp
-  frameworks/base/services/input/InputManager.cpp
   frameworks/base/services/input/InputReader.cpp
   frameworks/base/services/input/InputTransport.cpp
   frameworks/base/services/input/InputWindow.cpp

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	2013-05-13 09:35:44 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.cpp	2013-05-29 14:16:28 +0000
@@ -23,6 +23,8 @@
 #define acquire_wake_lock(lock, id) {}
 #define release_wake_lock(id) {}
 
+#include "mir/input/input_report.h"
+
 #include <cutils/properties.h>
 #include <std/Log.h>
 #include <std/Timers.h>
@@ -71,6 +73,7 @@
 #define INDENT2 "    "
 #define INDENT3 "      "
 
+namespace mi = mir::input;
 
 namespace android {
 
@@ -207,7 +210,8 @@
 const int EventHub::EPOLL_SIZE_HINT;
 const int EventHub::EPOLL_MAX_EVENTS;
 
-EventHub::EventHub(void) :
+EventHub::EventHub(std::shared_ptr<mi::InputReport> const& input_report) :
+        input_report(input_report),
         mBuiltInKeyboardId(NO_BUILT_IN_KEYBOARD), mNextDeviceId(1),
         mOpeningDevices(0), mClosingDevices(0),
         mNeedToSendFinishedDeviceScan(false),
@@ -808,6 +812,9 @@
                         event->type = iev.type;
                         event->code = iev.code;
                         event->value = iev.value;
+
+                        input_report->received_event_from_kernel(event->when, event->type, event->code, event->value);
+
                         event += 1;
                     }
                     capacity -= count;

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/EventHub.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2013-05-13 09:35:44 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/EventHub.h	2013-05-29 14:16:28 +0000
@@ -35,6 +35,16 @@
 #include <linux/input.h>
 #include <sys/epoll.h>
 
+#include <memory>
+
+namespace mir
+{
+namespace input
+{
+class InputReport;
+}
+}
+
 /* Convenience constants. */
 
 #define BTN_FIRST 0x100  // first button code
@@ -244,7 +254,7 @@
 class EventHub : public EventHubInterface
 {
 public:
-    EventHub();
+    EventHub(std::shared_ptr<mir::input::InputReport> const& input_report);
 
     virtual uint32_t getDeviceClasses(int32_t deviceId) const;
 
@@ -302,6 +312,8 @@
     virtual ~EventHub();
 
 private:
+    std::shared_ptr<mir::input::InputReport> const input_report;
+
     struct Device {
         Device* next;
 

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2013-05-01 16:53:31 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.cpp	2013-05-29 14:16:28 +0000
@@ -45,6 +45,8 @@
 
 #include "InputDispatcher.h"
 
+#include "mir/input/input_report.h"
+
 #include <cutils/log.h>
 #include <android/keycodes.h>
 
@@ -59,6 +61,8 @@
 #define INDENT3 "      "
 #define INDENT4 "        "
 
+namespace mi = mir::input;
+
 namespace android {
 
 // Default input dispatching timeout if there is no focused application or paused window
@@ -167,12 +171,14 @@
 
 // --- InputDispatcher ---
 
-InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy) :
-    mPolicy(policy),
-    mPendingEvent(NULL), mAppSwitchSawKeyDown(false), mAppSwitchDueTime(LONG_LONG_MAX),
-    mNextUnblockedEvent(NULL),
-    mDispatchEnabled(false), mDispatchFrozen(false), mInputFilterEnabled(false),
-    mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) {
+InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy, 
+    std::shared_ptr<mi::InputReport> const& input_report) :
+        input_report(input_report),
+        mPolicy(policy),
+        mPendingEvent(NULL), mAppSwitchSawKeyDown(false), mAppSwitchDueTime(LONG_LONG_MAX),
+        mNextUnblockedEvent(NULL),
+        mDispatchEnabled(false), mDispatchFrozen(false), mInputFilterEnabled(false),
+        mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) {
     mLooper = new Looper(false);
 
     mKeyRepeatState.lastKeyEntry = NULL;
@@ -1846,6 +1852,9 @@
                     keyEntry->keyCode, keyEntry->scanCode,
                     keyEntry->metaState, keyEntry->repeatCount, keyEntry->downTime,
                     keyEntry->eventTime);
+            input_report->published_key_event(connection->inputChannel->getFd(),
+                                              dispatchEntry->seq,
+                                              keyEntry->eventTime);
             break;
         }
 
@@ -1893,6 +1902,9 @@
                     motionEntry->downTime, motionEntry->eventTime,
                     motionEntry->pointerCount, motionEntry->pointerProperties,
                     usingCoords);
+            input_report->published_motion_event(connection->inputChannel->getFd(),
+                                                 dispatchEntry->seq,
+                                                 motionEntry->eventTime);
             break;
         }
 
@@ -2021,6 +2033,7 @@
                 if (status) {
                     break;
                 }
+                d->input_report->received_event_finished_signal(connection->inputChannel->getFd(), seq);
                 d->finishDispatchCycleLocked(currentTime, connection, seq, handled);
                 gotOne = true;
             }

=== modified file '3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h	2013-05-22 08:53:56 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputDispatcher.h	2013-05-29 14:16:28 +0000
@@ -39,6 +39,15 @@
 #include "InputApplication.h"
 #include "InputListener.h"
 
+#include <memory>
+
+namespace mir
+{
+namespace input
+{
+class InputReport;
+}
+}
 
 namespace android {
 
@@ -367,7 +376,7 @@
     virtual ~InputDispatcher();
 
 public:
-    explicit InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy);
+    explicit InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy, std::shared_ptr<mir::input::InputReport> const& input_report);
 
     virtual void dump(String8& dump);
     virtual void monitor();
@@ -397,6 +406,8 @@
     virtual status_t unregisterInputChannel(const sp<InputChannel>& inputChannel);
     
 private:
+    std::shared_ptr<mir::input::InputReport> const input_report;
+
     template <typename T>
     struct Link {
         T* next;

=== removed file '3rd_party/android-input/android/frameworks/base/services/input/InputManager.cpp'
--- 3rd_party/android-input/android/frameworks/base/services/input/InputManager.cpp	2012-11-06 18:05:11 +0000
+++ 3rd_party/android-input/android/frameworks/base/services/input/InputManager.cpp	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "InputManager"
-
-//#define LOG_NDEBUG 0
-
-#include "InputManager.h"
-
-#include <cutils/log.h>
-
-namespace android {
-
-InputManager::InputManager(
-        const sp<EventHubInterface>& eventHub,
-        const sp<InputReaderPolicyInterface>& readerPolicy,
-        const sp<InputDispatcherPolicyInterface>& dispatcherPolicy) {
-    mDispatcher = new InputDispatcher(dispatcherPolicy);
-    mReader = new InputReader(eventHub, readerPolicy, mDispatcher);
-    initialize();
-}
-
-InputManager::InputManager(
-        const sp<InputReaderInterface>& reader,
-        const sp<InputDispatcherInterface>& dispatcher) :
-        mReader(reader),
-        mDispatcher(dispatcher) {
-    initialize();
-}
-
-InputManager::~InputManager() {
-    stop();
-}
-
-void InputManager::initialize() {
-    mReaderThread = new InputReaderThread(mReader);
-    mDispatcherThread = new InputDispatcherThread(mDispatcher);
-}
-
-status_t InputManager::start() {
-    status_t result = mDispatcherThread->run("InputDispatcher", PRIORITY_URGENT_DISPLAY);
-    if (result) {
-        ALOGE("Could not start InputDispatcher thread due to error %d.", result);
-        return result;
-    }
-
-    result = mReaderThread->run("InputReader", PRIORITY_URGENT_DISPLAY);
-    if (result) {
-        ALOGE("Could not start InputReader thread due to error %d.", result);
-
-        mDispatcherThread->requestExit();
-        return result;
-    }
-
-    return OK;
-}
-
-status_t InputManager::stop() {
-    status_t result = mReaderThread->requestExitAndWait();
-    if (result) {
-        ALOGW("Could not stop InputReader thread due to error %d.", result);
-    }
-
-    result = mDispatcherThread->requestExitAndWait();
-    if (result) {
-        ALOGW("Could not stop InputDispatcher thread due to error %d.", result);
-    }
-
-    return OK;
-}
-
-sp<InputReaderInterface> InputManager::getReader() {
-    return mReader;
-}
-
-sp<InputDispatcherInterface> InputManager::getDispatcher() {
-    return mDispatcher;
-}
-
-} // namespace android

=== removed file '3rd_party/android-input/tools/CMakeLists.txt'
--- 3rd_party/android-input/tools/CMakeLists.txt	2013-05-04 00:53:42 +0000
+++ 3rd_party/android-input/tools/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-include_directories(
-  ../android/external/kernel-headers/original
-  ../android/frameworks/base/include
-  ../android/frameworks/base/services/input
-  ../android/frameworks/native/include
-  ../android/hardware/libhardware_legacy/include
-  ../android/system/core/include
-  ../android/system/extras/ext4_utils
-  /usr/include
-  )
-
-###### raw-event-printer
-
-add_executable(
-  raw-event-printer
-  raw_event_printer.cpp
-  )
-
-set_target_properties(
-  raw-event-printer
-  PROPERTIES
-  COMPILE_FLAGS ${ANDROID_INPUT_COMPILE_FLAGS}
-  )
-
-if(MIR_PLATFORM STREQUAL "gbm")
-  target_link_libraries(
-    raw-event-printer
-
-    android-input
-    )
-endif()
-
-if(MIR_PLATFORM STREQUAL "android")
-  target_link_libraries(
-    raw-event-printer
-
-    android-input
-    )
-endif()
-
-###### cooked-event-printer
-
-add_executable(
-  cooked-event-printer
-  cooked_event_printer.cpp
-  )
-
-set_target_properties(
-  cooked-event-printer
-  PROPERTIES
-  COMPILE_FLAGS ${ANDROID_INPUT_COMPILE_FLAGS}
-  )
-
-if(MIR_PLATFORM STREQUAL "gbm")
-  target_link_libraries(
-    cooked-event-printer
-    android-input
-    )
-endif()
-
-if(MIR_PLATFORM STREQUAL "android")
-  target_link_libraries(
-    cooked-event-printer
-    android-input
-    )
-endif()
-
-###### dispatcher-check
-
-add_executable(
-  dispatcher-check
-  dispatcher_check.cpp
-  )
-
-set_target_properties(
-  dispatcher-check
-  PROPERTIES
-  COMPILE_FLAGS ${ANDROID_INPUT_COMPILE_FLAGS}
-  )
-
-if(MIR_PLATFORM STREQUAL "gbm")
-  target_link_libraries(
-    dispatcher-check
-    android-input
-    -lrt
-    -lpthread
-    )
-endif()
-
-if(MIR_PLATFORM STREQUAL "android")
-  target_link_libraries(
-    dispatcher-check
-    android-input
-    )
-endif()
-
-
-target_link_libraries(cooked-event-printer    ${Boost_LIBRARIES})
-target_link_libraries(raw-event-printer       ${Boost_LIBRARIES})
-target_link_libraries(dispatcher-check        ${Boost_LIBRARIES})
-

=== removed file '3rd_party/android-input/tools/cooked_event_printer.cpp'
--- 3rd_party/android-input/tools/cooked_event_printer.cpp	2012-11-06 18:05:11 +0000
+++ 3rd_party/android-input/tools/cooked_event_printer.cpp	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-#include <EventHub.h>
-#include <InputListener.h>
-#include <InputReader.h>
-
-#include <iostream>
-
-using namespace android;
-
-/******************************************************************************
- * InputListener
- ******************************************************************************/
-
-class InputListener : public android::InputListenerInterface {
-public:
-    InputListener();
-    virtual ~InputListener();
-
-    virtual void notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args);
-    virtual void notifyKey(const NotifyKeyArgs* args);
-    virtual void notifyMotion(const NotifyMotionArgs* args);
-    virtual void notifySwitch(const NotifySwitchArgs* args);
-    virtual void notifyDeviceReset(const NotifyDeviceResetArgs* args);
-};
-
-InputListener::InputListener()
-{
-}
-
-InputListener::~InputListener()
-{
-}
-
-void InputListener::notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args)
-{
-}
-
-void InputListener::notifyKey(const NotifyKeyArgs* args)
-{
-    std::cout << "key" << std::endl;
-}
-
-void InputListener::notifyMotion(const NotifyMotionArgs* args)
-{
-    std::cout << "motion" << std::endl;
-}
-
-void InputListener::notifySwitch(const NotifySwitchArgs* args)
-{
-}
-
-void InputListener::notifyDeviceReset(const NotifyDeviceResetArgs* args)
-{
-}
-
-/******************************************************************************
- * InputReaderPolicy
- ******************************************************************************/
-
-class InputReaderPolicy : public android::InputReaderPolicyInterface {
-public:
-    InputReaderPolicy();
-    virtual ~InputReaderPolicy() { }
-
-    virtual void getReaderConfiguration(InputReaderConfiguration* outConfig);
-    virtual sp<PointerControllerInterface> obtainPointerController(int32_t deviceId);
-    virtual void notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices);
-    virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor);
-    virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier);
-private:
-    sp<android::PointerController> mPointerController;
-};
-
-InputReaderPolicy::InputReaderPolicy()
-{
-    mPointerController = new android::PointerController;
-    mPointerController->setDisplaySize(1280, 1024);
-    mPointerController->setDisplayOrientation(android::DISPLAY_ORIENTATION_0);
-}
-
-void InputReaderPolicy::getReaderConfiguration(InputReaderConfiguration* outConfig)
-{
-  outConfig->setDisplayInfo(0, /* id */
-                            false, /* external  */
-                            1280, /* width */
-                            1024, /*height*/
-                            DISPLAY_ORIENTATION_0 /* orientation */);
-}
-
-sp<PointerControllerInterface> InputReaderPolicy::obtainPointerController(int32_t deviceId)
-{
-    return mPointerController;
-}
-
-void InputReaderPolicy::notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices)
-{
-}
-
-sp<KeyCharacterMap> InputReaderPolicy::getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor)
-{
-    return KeyCharacterMap::empty();
-}
-
-String8 InputReaderPolicy::getDeviceAlias(const InputDeviceIdentifier& identifier)
-{
-    return String8();
-}
-
-/******************************************************************************
- * main
- ******************************************************************************/
-
-int main()
-{
-    sp<EventHub> eventHub = new EventHub;
-    sp<InputReaderPolicy> inputReaderPolicy = new InputReaderPolicy;
-    sp<InputListener> inputListener = new InputListener;
-
-    InputReader* inputReader = new InputReader(eventHub,
-                                               inputReaderPolicy,
-                                               inputListener);
-
-    while (true) {
-        inputReader->loopOnce();
-    }
-
-    return 0;
-}

=== removed file '3rd_party/android-input/tools/dispatcher_check.cpp'
--- 3rd_party/android-input/tools/dispatcher_check.cpp	2013-05-03 16:38:07 +0000
+++ 3rd_party/android-input/tools/dispatcher_check.cpp	1970-01-01 00:00:00 +0000
@@ -1,302 +0,0 @@
-
-#include <InputManager.h>
-#include <pthread.h>
-#include <std/Thread.h>
-#include <iostream>
-
-using namespace android;
-
-/******************************************************************************
- * InputReaderPolicy
- ******************************************************************************/
-
-class InputReaderPolicy : public InputReaderPolicyInterface
-{
-public:
-    InputReaderPolicy();
-    virtual ~InputReaderPolicy() { }
-
-    virtual void getReaderConfiguration(InputReaderConfiguration* outConfig);
-    virtual sp<PointerControllerInterface> obtainPointerController(int32_t deviceId);
-    virtual void notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices);
-    virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor);
-    virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier);
-private:
-    sp<android::PointerController> mPointerController;
-};
-
-InputReaderPolicy::InputReaderPolicy()
-{
-    mPointerController = new android::PointerController;
-    mPointerController->setDisplaySize(1280, 1024);
-    mPointerController->setDisplayOrientation(android::DISPLAY_ORIENTATION_0);
-}
-
-void InputReaderPolicy::getReaderConfiguration(InputReaderConfiguration* outConfig)
-{
-  outConfig->setDisplayInfo(0, /* id */
-                            false, /* external  */
-                            1280, /* width */
-                            1024, /*height*/
-                            DISPLAY_ORIENTATION_0 /* orientation */);
-}
-
-sp<PointerControllerInterface> InputReaderPolicy::obtainPointerController(int32_t deviceId)
-{
-    return mPointerController;
-}
-
-void InputReaderPolicy::notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices)
-{
-}
-
-sp<KeyCharacterMap> InputReaderPolicy::getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor)
-{
-    return KeyCharacterMap::empty();
-}
-
-String8 InputReaderPolicy::getDeviceAlias(const InputDeviceIdentifier& identifier)
-{
-    return String8();
-}
-
-/******************************************************************************
- * InputDispatcherPolicy
- ******************************************************************************/
-
-class InputDispatcherPolicy : public InputDispatcherPolicyInterface
-{
-public:
-    InputDispatcherPolicy() {}
-    virtual ~InputDispatcherPolicy() {}
-
-    virtual void notifyConfigurationChanged(nsecs_t when);
-    virtual nsecs_t notifyANR(const sp<InputApplicationHandle>& inputApplicationHandle,
-            const sp<InputWindowHandle>& inputWindowHandle);
-    virtual void notifyInputChannelBroken(const sp<InputWindowHandle>& inputWindowHandle);
-    virtual void getDispatcherConfiguration(InputDispatcherConfiguration* outConfig);
-    virtual bool isKeyRepeatEnabled();
-    virtual bool filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags);
-    virtual void interceptKeyBeforeQueueing(const KeyEvent* keyEvent, uint32_t& policyFlags);
-    virtual void interceptMotionBeforeQueueing(nsecs_t when, uint32_t& policyFlags);
-    virtual nsecs_t interceptKeyBeforeDispatching(const sp<InputWindowHandle>& inputWindowHandle,
-            const KeyEvent* keyEvent, uint32_t policyFlags);
-    virtual bool dispatchUnhandledKey(const sp<InputWindowHandle>& inputWindowHandle,
-            const KeyEvent* keyEvent, uint32_t policyFlags, KeyEvent* outFallbackKeyEvent);
-    virtual void notifySwitch(nsecs_t when,
-            int32_t switchCode, int32_t switchValue, uint32_t policyFlags);
-    virtual void pokeUserActivity(nsecs_t eventTime, int32_t eventType);
-    virtual bool checkInjectEventsPermissionNonReentrant(
-            int32_t injectorPid, int32_t injectorUid);
-};
-
-void InputDispatcherPolicy::notifyConfigurationChanged(nsecs_t when)
-{
-    (void)when;
-}
-
-nsecs_t InputDispatcherPolicy::notifyANR(
-    const sp<InputApplicationHandle>& inputApplicationHandle,
-    const sp<InputWindowHandle>& inputWindowHandle)
-{
-    (void)inputApplicationHandle;
-    (void)inputWindowHandle;
-    return 0;
-}
-
-void InputDispatcherPolicy::notifyInputChannelBroken(
-    const sp<InputWindowHandle>& inputWindowHandle)
-{
-    (void)inputWindowHandle;
-}
-
-void InputDispatcherPolicy::getDispatcherConfiguration(InputDispatcherConfiguration* outConfig)
-{
-   (void)outConfig;
-}
-
-bool InputDispatcherPolicy::isKeyRepeatEnabled()
-{
-    return true;
-}
-
-bool InputDispatcherPolicy::filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags)
-{
-    (void)inputEvent;
-    (void)policyFlags;
-    return true;
-}
-
-void InputDispatcherPolicy::interceptKeyBeforeQueueing(const KeyEvent* keyEvent,
-                                                       uint32_t& policyFlags)
-{
-    (void)keyEvent;
-    policyFlags = POLICY_FLAG_PASS_TO_USER;
-}
-
-void InputDispatcherPolicy::interceptMotionBeforeQueueing(nsecs_t when, uint32_t& policyFlags)
-{
-    (void)when;
-    policyFlags = POLICY_FLAG_PASS_TO_USER;
-}
-
-nsecs_t InputDispatcherPolicy::interceptKeyBeforeDispatching(
-    const sp<InputWindowHandle>& inputWindowHandle,
-    const KeyEvent* keyEvent, uint32_t policyFlags)
-{
-    (void)inputWindowHandle;
-    (void)keyEvent;
-    (void)policyFlags;
-    return 0;
-}
-
-bool InputDispatcherPolicy::dispatchUnhandledKey(const sp<InputWindowHandle>& inputWindowHandle,
-        const KeyEvent* keyEvent, uint32_t policyFlags, KeyEvent* outFallbackKeyEvent)
-{
-    (void)inputWindowHandle;
-    (void)keyEvent;
-    (void)policyFlags;
-    (void)outFallbackKeyEvent;
-    return false;
-}
-
-void InputDispatcherPolicy::notifySwitch(nsecs_t when,
-        int32_t switchCode, int32_t switchValue, uint32_t policyFlags)
-{
-    (void)when;
-    (void)switchCode;
-    (void)switchValue;
-    (void)policyFlags;
-}
-
-void InputDispatcherPolicy::pokeUserActivity(nsecs_t eventTime, int32_t eventType)
-{
-    (void)eventTime;
-    (void)eventType;
-}
-
-bool InputDispatcherPolicy::checkInjectEventsPermissionNonReentrant(
-        int32_t injectorPid, int32_t injectorUid)
-{
-    (void)injectorPid;
-    (void)injectorUid;
-    return true;
-}
-
-/******************************************************************************
- * FakeWindowHandle
- ******************************************************************************/
-
-class FakeWindowHandle : public InputWindowHandle
-{
-public:
-    FakeWindowHandle(const sp<InputApplicationHandle>& inputApplicationHandle)
-        : InputWindowHandle(inputApplicationHandle) {
-        mInfo = new InputWindowInfo;
-    }
-    virtual ~FakeWindowHandle() {}
-
-    bool updateInfo() { return true; }
-
-    InputWindowInfo* info() {return mInfo;}
-};
-
-/******************************************************************************
- * FakeApplicationHandle
- ******************************************************************************/
-
-class FakeApplicationHandle : public InputApplicationHandle
-{
-public:
-    virtual bool updateInfo() { return true; }
-};
-
-/******************************************************************************
- * ClientThread
- ******************************************************************************/
-
-class ClientThread : public Thread {
-public:
-    explicit ClientThread(const sp<InputChannel>& inputChannel);
-    ~ClientThread() {}
-
-private:
-    virtual bool threadLoop();
-    void printEvent(InputEvent *event, uint32_t seq);
-
-    InputConsumer inputConsumer;
-    PooledInputEventFactory eventFactory;
-};
-
-ClientThread::ClientThread(const sp<InputChannel>& inputChannel)
-    : Thread(), inputConsumer(inputChannel)
-{
-}
-
-bool ClientThread::threadLoop()
-{
-    status_t status;
-    uint32_t seq;
-    nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
-    InputEvent *event;
-
-    status = inputConsumer.consume(&eventFactory, true /* consumeBatches */,
-            now, &seq, &event);
-
-    if (status == OK) {
-        printEvent(event, seq);
-        inputConsumer.sendFinishedSignal(seq, true /* handled */);
-    }
-
-    // Continue the thread if this condition is met
-    return status == OK || status == WOULD_BLOCK;
-}
-
-void ClientThread::printEvent(InputEvent *event, uint32_t seq)
-{
-    std::cout << "client got event, seq " << seq << std::endl;
-}
-
-/******************************************************************************
- * main
- ******************************************************************************/
-
-int main()
-{
-    sp<EventHub> eventHub = new EventHub;
-    sp<InputReaderPolicy> inputReaderPolicy = new InputReaderPolicy;
-    sp<InputDispatcherPolicy> inputDispatcherPolicy = new InputDispatcherPolicy;
-    sp<InputManager> inputManager = new InputManager(eventHub,
-                                                     inputReaderPolicy,
-                                                     inputDispatcherPolicy);
-
-
-    sp<FakeWindowHandle> windowHandle = new FakeWindowHandle(new FakeApplicationHandle);
-    Vector<sp<InputWindowHandle> > inputWindowHandles;
-    inputWindowHandles.push(windowHandle);
-
-    sp<InputChannel> serverChannel, clientChannel;
-    status_t status = InputChannel::openInputChannelPair(String8("foo"),
-                                                         serverChannel,
-                                                         clientChannel);
-    assert(status == OK);
-
-    windowHandle->info()->inputChannel = serverChannel;
-    windowHandle->info()->hasFocus = true;
-
-    sp<InputDispatcherInterface> dispatcher = inputManager->getDispatcher();
-    dispatcher->setInputWindows(inputWindowHandles);
-    dispatcher->registerInputChannel(serverChannel, windowHandle, false);
-    dispatcher->setInputDispatchMode(true /* enabled */, false /* frozen */);
-
-    inputManager->start();
-
-    sp<ClientThread> clientThread = new ClientThread(clientChannel);
-    clientThread->run();
-
-    clientThread->join();
-
-    inputManager->stop();
-
-    return 0;
-}

=== removed file '3rd_party/android-input/tools/raw_event_printer.cpp'
--- 3rd_party/android-input/tools/raw_event_printer.cpp	2012-11-06 18:05:11 +0000
+++ 3rd_party/android-input/tools/raw_event_printer.cpp	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#include <EventHub.h>
-#include <iostream>
-
-static void printRawEvent(const android::RawEvent &raw_event)
-{
-  std::cout << "==== RawEvent ====" << std::endl;
-  std::cout << "when    : " << raw_event.when << std::endl;
-  std::cout << "deviceId: " << raw_event.deviceId << std::endl;
-  std::cout << "type    : " << raw_event.type << std::endl;
-  std::cout << "code    : " << raw_event.code << std::endl;
-  std::cout << "value   : " << raw_event.value << std::endl;
-  std::cout << "==================" << std::endl;
-  std::cout << std::endl;
-}
-
-int main()
-{
-  android::EventHub* event_hub = new android::EventHub;
-  static const size_t buffer_size = 100;
-  android::RawEvent raw_events[buffer_size];
-
-  size_t events_read;
-  do
-  {
-    events_read = event_hub->getEvents(10000, raw_events, buffer_size);
-    for (size_t i = 0; i < events_read; ++i)
-    {
-      printRawEvent(raw_events[i]);
-    }
-  }
-  while(events_read > 0);
-  
-  return 0;
-}

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-05-13 23:27:28 +0000
+++ include/server/mir/default_server_configuration.h	2013-05-29 14:16:28 +0000
@@ -82,6 +82,7 @@
 }
 namespace input
 {
+class InputReport;
 class InputManager;
 class EventFilter;
 class InputChannelFactory;
@@ -183,6 +184,7 @@
 
     /** @name input configuration
      *  @{ */
+    virtual std::shared_ptr<input::InputReport> the_input_report();
     virtual std::shared_ptr<input::android::InputConfiguration> the_input_configuration();
     virtual std::initializer_list<std::shared_ptr<input::EventFilter> const> the_event_filters();
     virtual std::shared_ptr<shell::InputTargetListener> the_input_target_listener();
@@ -210,6 +212,8 @@
 
     CachedPtr<frontend::Communicator> communicator;
     CachedPtr<shell::SessionManager> session_manager;
+
+    CachedPtr<input::InputReport> input_report;
     std::shared_ptr<input::android::InputConfiguration> input_configuration;
     CachedPtr<input::InputManager>    input_manager;
     CachedPtr<shell::InputTargetListener> input_target_listener;

=== added file 'include/server/mir/input/input_report.h'
--- include/server/mir/input/input_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/input_report.h	2013-05-29 14:16:28 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2013 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,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+
+#ifndef MIR_INPUT_INPUT_REPORT_H_
+#define MIR_INPUT_INPUT_REPORT_H_
+
+#include <stdint.h>
+
+namespace mir
+{
+namespace input
+{
+
+class InputReport
+{
+public:
+    virtual ~InputReport() = default;
+    
+    virtual void received_event_from_kernel(int64_t when, int type, int code, int value) = 0;
+
+    virtual void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) = 0;
+
+    virtual void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) = 0;
+
+    virtual void received_event_finished_signal(int src_fd, uint32_t seq_id) = 0;
+    
+protected:
+    InputReport() = default;
+    InputReport(InputReport const&) = delete;
+    InputReport& operator=(InputReport const&) = delete;
+};
+
+}
+}
+
+#endif /* MIR_INPUT_INPUT_REPORT_H_ */

=== added file 'include/server/mir/input/null_input_report.h'
--- include/server/mir/input/null_input_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/input/null_input_report.h	2013-05-29 14:16:28 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2013 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,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+
+#ifndef MIR_INPUT_NULL_INPUT_REPORT_H_
+#define MIR_INPUT_NULL_INPUT_REPORT_H_
+
+#include "mir/input/input_report.h"
+
+namespace mir
+{
+namespace input
+{
+
+class NullInputReport : public InputReport
+{
+public:
+    NullInputReport() = default;
+    virtual ~NullInputReport() noexcept(true) = default;
+    
+    void received_event_from_kernel(int64_t when, int type, int code, int value);
+
+    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);
+    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);
+
+    void received_event_finished_signal(int src_fd, uint32_t seq_id);
+};
+
+}
+}
+
+#endif /* MIR_INPUT_NULL_INPUT_REPORT_H_ */

=== modified file 'include/server/mir/logging/input_report.h'
--- include/server/mir/logging/input_report.h	2013-05-03 23:19:47 +0000
+++ include/server/mir/logging/input_report.h	2013-05-29 14:16:28 +0000
@@ -19,6 +19,8 @@
 #ifndef MIR_LOGGING_INPUT_REPORT_H_
 #define MIR_LOGGING_INPUT_REPORT_H_
 
+#include "mir/input/input_report.h"
+
 #include <memory>
 
 namespace mir
@@ -27,10 +29,29 @@
 {
 class Logger;
 
-namespace input_report
+namespace legacy_input_report
 {
 void initialize(std::shared_ptr<Logger> const& logger);
 }
+
+class InputReport : public input::InputReport
+{
+public:
+    InputReport(std::shared_ptr<Logger> const& logger);
+    virtual ~InputReport() noexcept(true) = default;
+    
+    void received_event_from_kernel(int64_t when, int type, int code, int value);
+
+    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);
+    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);
+
+    void received_event_finished_signal(int src_fd, uint32_t seq_id);
+    
+private:
+    char const* component();
+    std::shared_ptr<Logger> const logger;
+};
+
 }
 }
 

=== added file 'include/server/mir/lttng/input_report.h'
--- include/server/mir/lttng/input_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/lttng/input_report.h	2013-05-29 14:16:28 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2013 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,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_LTTNG_INPUT_REPORT_H_
+#define MIR_LTTNG_INPUT_REPORT_H_
+
+#include "mir/input/input_report.h"
+#include "mir/lttng/tracepoint_provider.h"
+
+namespace mir
+{
+namespace lttng
+{
+
+class InputReport : public input::InputReport
+{
+public:
+    InputReport() = default;
+    virtual ~InputReport() noexcept(true) = default;
+    
+    void received_event_from_kernel(int64_t when, int type, int code, int value);
+
+    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);
+    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);
+
+    void received_event_finished_signal(int src_fd, uint32_t seq_id);
+    
+private:
+    TracepointProvider tp_provider;
+};
+
+}
+}
+
+
+#endif /* MIR_LTTNG_INPUT_REPORT_H_ */

=== modified file 'include/test/mir_test/fake_event_hub_input_configuration.h'
--- include/test/mir_test/fake_event_hub_input_configuration.h	2013-04-26 16:12:22 +0000
+++ include/test/mir_test/fake_event_hub_input_configuration.h	2013-05-29 14:16:28 +0000
@@ -42,6 +42,7 @@
 {
 class CursorListener;
 class EventFilter;
+class InputReport;
 
 namespace android
 {
@@ -56,9 +57,10 @@
 class FakeEventHubInputConfiguration : public input::android::DefaultInputConfiguration
 {
 public:
-    FakeEventHubInputConfiguration(std::initializer_list<std::shared_ptr<mir::input::EventFilter> const> const& filters,
-                                   std::shared_ptr<mir::graphics::ViewableArea> const& view_area,
-                                   std::shared_ptr<mir::input::CursorListener> const& cursor_listener);
+    FakeEventHubInputConfiguration(std::initializer_list<std::shared_ptr<input::EventFilter> const> const& filters,
+                                   std::shared_ptr<graphics::ViewableArea> const& view_area,
+                                   std::shared_ptr<input::CursorListener> const& cursor_listener,
+                                   std::shared_ptr<input::InputReport> const& input_report);
     virtual ~FakeEventHubInputConfiguration();
 
     droidinput::sp<droidinput::EventHubInterface> the_event_hub();

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-05-22 17:41:14 +0000
+++ src/server/default_server_configuration.cpp	2013-05-29 14:16:28 +0000
@@ -50,6 +50,7 @@
 #include "mir/input/cursor_listener.h"
 #include "mir/input/null_input_manager.h"
 #include "mir/input/null_input_target_listener.h"
+#include "mir/input/null_input_report.h"
 #include "input/android/default_android_input_configuration.h"
 #include "input/android/android_input_manager.h"
 #include "input/android/android_dispatcher_controller.h"
@@ -61,6 +62,7 @@
 #include "mir/logging/message_processor_report.h"
 #include "mir/logging/display_report.h"
 #include "mir/lttng/message_processor_report.h"
+#include "mir/lttng/input_report.h"
 #include "mir/shell/surface_source.h"
 #include "mir/surfaces/surface_stack.h"
 #include "mir/surfaces/surface_controller.h"
@@ -141,6 +143,7 @@
 char const* const session_mediator_report_opt = "session-mediator-report";
 char const* const msg_processor_report_opt    = "msg-processor-report";
 char const* const display_report_opt          = "display-report";
+char const* const legacy_input_report_opt     = "legacy-input-report";
 char const* const input_report_opt            = "input-report";
 
 char const* const glog                 = "glog";
@@ -215,7 +218,9 @@
         (display_report_opt, po::value<std::string>(),
             "How to handle the Display report. [{log,off}:default=off]")
         (input_report_opt, po::value<std::string>(),
-            "How to handle the Input report. [{log,off}:default=off]")
+            "How to handle to Input report. [{log,lttng,off}:default=off]")
+        (legacy_input_report_opt, po::value<std::string>(),
+            "How to handle the Legacy Input report. [{log,off}:default=off]")
         (session_mediator_report_opt, po::value<std::string>(),
             "How to handle the SessionMediator report. [{log,off}:default=off]")
         (msg_processor_report_opt, po::value<std::string>(),
@@ -412,6 +417,29 @@
     return empty_filter_list;
 }
 
+std::shared_ptr<mi::InputReport>
+mir::DefaultServerConfiguration::the_input_report()
+{
+    return input_report(
+        [this]() -> std::shared_ptr<mi::InputReport>
+        {
+            auto opt = the_options()->get(input_report_opt, off_opt_value);
+            
+            if (opt == log_opt_value)
+            {
+                return std::make_shared<ml::InputReport>(the_logger());
+            }
+            else if (opt == lttng_opt_value)
+            {
+                return std::make_shared<mir::lttng::InputReport>();
+            }
+            else
+            {
+                return std::make_shared<mi::NullInputReport>();
+            }
+        });
+}
+
 std::shared_ptr<mia::InputConfiguration>
 mir::DefaultServerConfiguration::the_input_configuration()
 {
@@ -438,7 +466,8 @@
         input_configuration = std::make_shared<mia::DefaultInputConfiguration>(
             the_event_filters(),
             the_display(),
-            std::make_shared<DefaultCursorListener>(the_display()->the_cursor()));
+            std::make_shared<DefaultCursorListener>(the_display()->the_cursor()),
+            the_input_report());
     }
     return input_configuration;
 }
@@ -451,8 +480,8 @@
         {
             if (the_options()->get("enable-input", enable_input_default))
             {
-                if (the_options()->get(input_report_opt, off_opt_value) == log_opt_value)
-                    ml::input_report::initialize(the_logger());
+                if (the_options()->get(legacy_input_report_opt, off_opt_value) == log_opt_value)
+                    ml::legacy_input_report::initialize(the_logger());
                 return std::make_shared<mia::InputManager>(the_input_configuration());
             }
             else 

=== modified file 'src/server/input/CMakeLists.txt'
--- src/server/input/CMakeLists.txt	2013-04-24 05:22:20 +0000
+++ src/server/input/CMakeLists.txt	2013-05-29 14:16:28 +0000
@@ -2,6 +2,7 @@
   INPUT_SOURCES
 
   event_filter_chain.cpp
+  null_input_report.cpp
 )
 
 add_subdirectory(android)

=== modified file 'src/server/input/android/default_android_input_configuration.cpp'
--- src/server/input/android/default_android_input_configuration.cpp	2013-05-02 00:11:18 +0000
+++ src/server/input/android/default_android_input_configuration.cpp	2013-05-29 14:16:28 +0000
@@ -73,10 +73,12 @@
 
 mia::DefaultInputConfiguration::DefaultInputConfiguration(std::initializer_list<std::shared_ptr<mi::EventFilter> const> const& filters,
                                                           std::shared_ptr<mg::ViewableArea> const& view_area,
-                                                          std::shared_ptr<mi::CursorListener> const& cursor_listener)
+                                                          std::shared_ptr<mi::CursorListener> const& cursor_listener,
+                                                          std::shared_ptr<mi::InputReport> const& input_report)
   : filter_chain(std::make_shared<mi::EventFilterChain>(filters)),
     view_area(view_area),
-    cursor_listener(cursor_listener)
+    cursor_listener(cursor_listener),
+    input_report(input_report)
 {
 }
 
@@ -89,7 +91,7 @@
     return event_hub(
         [this]()
         {
-            return new droidinput::EventHub();
+            return new droidinput::EventHub(input_report);
         });
 }
 
@@ -107,7 +109,7 @@
     return dispatcher(
         [this]()
         {
-            return new droidinput::InputDispatcher(the_dispatcher_policy());
+            return new droidinput::InputDispatcher(the_dispatcher_policy(), input_report);
         });
 }
 

=== modified file 'src/server/input/android/default_android_input_configuration.h'
--- src/server/input/android/default_android_input_configuration.h	2013-05-02 00:11:18 +0000
+++ src/server/input/android/default_android_input_configuration.h	2013-05-29 14:16:28 +0000
@@ -48,6 +48,7 @@
 class EventFilter;
 class EventFilterChain;
 class CursorListener;
+class InputReport;
 
 namespace android
 {
@@ -57,7 +58,8 @@
 public:
     DefaultInputConfiguration(std::initializer_list<std::shared_ptr<EventFilter> const> const& filters,
                               std::shared_ptr<graphics::ViewableArea> const& view_area,
-                              std::shared_ptr<CursorListener> const& cursor_listener);
+                              std::shared_ptr<CursorListener> const& cursor_listener,
+                              std::shared_ptr<input::InputReport> const& input_report);
     virtual ~DefaultInputConfiguration();
 
     droidinput::sp<droidinput::EventHubInterface> the_event_hub();
@@ -102,6 +104,7 @@
     std::shared_ptr<EventFilterChain> const filter_chain;
     std::shared_ptr<graphics::ViewableArea> const view_area;
     std::shared_ptr<CursorListener> const cursor_listener;
+    std::shared_ptr<input::InputReport> const input_report;
 
     CachedPtr<InputThread> dispatcher_thread;
     CachedPtr<InputThread> reader_thread;

=== added file 'src/server/input/null_input_report.cpp'
--- src/server/input/null_input_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/input/null_input_report.cpp	2013-05-29 14:16:28 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2013 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,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Robert Carr <[e-mail]>
+ */
+
+#include "mir/input/null_input_report.h"
+
+namespace mi = mir::input;
+
+void mi::NullInputReport::received_event_from_kernel(int64_t /* when */, int /* type */, int /* code */, int /* value */)
+{
+}
+
+void mi::NullInputReport::published_key_event(int /* dest_fd */, uint32_t /* seq_id */, int64_t /* event_time */)
+{
+}
+
+void mi::NullInputReport::published_motion_event(int /* dest_fd */, uint32_t /* seq_id */, int64_t /* event_time */)
+{
+}
+
+void mi::NullInputReport::received_event_finished_signal(int /* src_fd */, uint32_t /* seq_id */)
+{
+}
+
+

=== modified file 'src/server/logging/input_report.cpp'
--- src/server/logging/input_report.cpp	2013-05-04 00:04:19 +0000
+++ src/server/logging/input_report.cpp	2013-05-29 14:16:28 +0000
@@ -22,24 +22,27 @@
 #include "std/MirLog.h"
 #include <std/Log.h>
 
+
+#include <sstream>
+#include <cstring>
 #include <mutex>
 
 namespace ml = mir::logging;
-namespace mli = mir::logging::input_report;
+namespace mlil = mir::logging::legacy_input_report;
 
 namespace
 {
 char const* const component = "android-input";
 
-class MyInputReport;
+class LegacyInputReport;
 
 std::mutex mutex;
-std::shared_ptr<MyInputReport> the_input_report;
+std::shared_ptr<LegacyInputReport> the_legacy_input_report;
 
-class MyInputReport
+class LegacyInputReport
 {
 public:
-    MyInputReport(std::shared_ptr<ml::Logger> const& logger) :
+    LegacyInputReport(std::shared_ptr<ml::Logger> const& logger) :
         logger(logger)
     {
     }
@@ -75,15 +78,62 @@
 void my_write_to_log(int prio, char const* buffer)
 {
     std::unique_lock<std::mutex> lock(mutex);
-    the_input_report->log(prio, buffer);
-}
-}
-
-
-void mli::initialize(std::shared_ptr<Logger> const& logger)
+    the_legacy_input_report->log(prio, buffer);
+}
+}
+
+
+void mlil::initialize(std::shared_ptr<Logger> const& logger)
 {
     std::unique_lock<std::mutex> lock(mutex);
-    ::the_input_report = std::make_shared<MyInputReport>(logger);
+    ::the_legacy_input_report = std::make_shared<LegacyInputReport>(logger);
 
     mir::write_to_log = my_write_to_log;
 }
+
+
+ml::InputReport::InputReport(const std::shared_ptr<Logger>& logger) 
+    : logger(logger)
+{
+}
+
+const char* ml::InputReport::component()
+{
+    static const char* s = "input";
+    return s;
+}
+
+void ml::InputReport::received_event_from_kernel(int64_t when, int type, int code, int value)
+{
+    std::stringstream ss;
+    
+    ss << "Received event (when, type, code, value) from kernel: "
+       << "(" << when << "ns, " << type << ", " << code << ", " << value << ")";
+    logger->log<Logger::informational>(ss.str(), component());
+}
+
+void ml::InputReport::published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time)
+{
+    std::stringstream ss;
+
+    ss << "Published key event (seq_id, event_time) to fd " << dest_fd << ": (" 
+        << seq_id << ", " << event_time << ")";
+    logger->log<Logger::informational>(ss.str(), component());
+}
+
+void ml::InputReport::published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time)
+{
+    std::stringstream ss;
+
+    ss << "Published motion event (seq_id, event_time) to fd " << dest_fd << ": (" 
+        << seq_id << ", " << event_time << ")";
+    logger->log<Logger::informational>(ss.str(), component());
+}
+
+void ml::InputReport::received_event_finished_signal(int src_fd, uint32_t seq_id)
+{
+    std::stringstream ss;
+    
+    ss << "Received event finished (seq_id) from fd " << src_fd << ": " << seq_id;
+    logger->log<Logger::informational>(ss.str(), component());
+}

=== modified file 'src/server/lttng/CMakeLists.txt'
--- src/server/lttng/CMakeLists.txt	2013-05-22 10:24:51 +0000
+++ src/server/lttng/CMakeLists.txt	2013-05-29 14:16:28 +0000
@@ -5,6 +5,7 @@
 
   tracepoint_provider.cpp
   message_processor_report.cpp
+  input_report.cpp
 )
 
 add_library(
@@ -17,6 +18,7 @@
   MIR_SERVER_LTTNG_SOURCES
 
   message_processor_report_tp.c
+  input_report_tp.c
 )
 
 add_library(

=== added file 'src/server/lttng/input_report.cpp'
--- src/server/lttng/input_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/lttng/input_report.cpp	2013-05-29 14:16:28 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2013 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,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "mir/lttng/input_report.h"
+
+#define TRACEPOINT_DEFINE
+#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
+#include "input_report_tp.h"
+
+#include "mir_tracepoint.h"
+
+void mir::lttng::InputReport::received_event_from_kernel(int64_t when, int type, int code, int value)
+{
+    mir_tracepoint(mir_server_input, received_event_from_kernel, when, type, code, value);
+}
+
+void mir::lttng::InputReport::published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time)
+{
+    mir_tracepoint(mir_server_input, published_key_event, dest_fd, seq_id, event_time);
+}
+
+void mir::lttng::InputReport::published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time)
+{
+    mir_tracepoint(mir_server_input, published_motion_event, dest_fd, seq_id, event_time);
+}
+
+void mir::lttng::InputReport::received_event_finished_signal(int src_fd, uint32_t seq_id)
+{
+    mir_tracepoint(mir_server_input, received_event_finished_signal, src_fd, seq_id);
+}

=== added file 'src/server/lttng/input_report_tp.c'
--- src/server/lttng/input_report_tp.c	1970-01-01 00:00:00 +0000
+++ src/server/lttng/input_report_tp.c	2013-05-29 14:16:28 +0000
@@ -0,0 +1,4 @@
+/* The probes need to be compiled in a C file (not C++) */
+#define TRACEPOINT_CREATE_PROBES
+
+#include "input_report_tp.h"

=== added file 'src/server/lttng/input_report_tp.h'
--- src/server/lttng/input_report_tp.h	1970-01-01 00:00:00 +0000
+++ src/server/lttng/input_report_tp.h	2013-05-29 14:16:28 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2013 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,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alexandros Frantzis <[e-mail]>
+ */
+
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER mir_server_input
+
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./input_report_tp.h"
+
+#if !defined(MIR_LTTNG_INPUT_REPORT_TP_H_) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define MIR_LTTNG_INPUT_REPORT_TP_H_
+
+#include <lttng/tracepoint.h>
+#include <stdint.h>
+
+TRACEPOINT_EVENT(
+    mir_server_input,
+    received_event_from_kernel,
+    TP_ARGS(int64_t, when, int, type, int, code, int, value),
+    TP_FIELDS(
+        ctf_integer(int64_t, when, when)
+        ctf_integer(int, type, type)
+        ctf_integer(int, code, code)
+        ctf_integer(int, value, value)
+     )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_input,
+    published_key_event,
+    TP_ARGS(int, dest_fd, uint32_t, seq_id, int64_t, event_time),
+    TP_FIELDS(
+        ctf_integer(int, dest_fd, dest_fd)
+        ctf_integer(uint32_t, seq_id, seq_id)
+        ctf_integer(int64_t, event_time, event_time)
+     )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_input,
+    published_motion_event,
+    TP_ARGS(int, dest_fd, uint32_t, seq_id, int64_t, event_time),
+    TP_FIELDS(
+        ctf_integer(int, dest_fd, dest_fd)
+        ctf_integer(uint32_t, seq_id, seq_id)
+        ctf_integer(int64_t, event_time, event_time)
+     )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_input,
+    received_event_finished_signal,
+    TP_ARGS(int, src_fd, uint32_t, seq_id),
+    TP_FIELDS(
+        ctf_integer(int, src_fd, src_fd)
+        ctf_integer(uint32_t, seq_id, seq_id)
+    )
+)
+
+
+#endif /* MIR_LTTNG_MESSAGE_PROCESSOR_REPORT_TP_H_ */
+
+#include <lttng/tracepoint-event.h>

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2013-05-02 00:11:18 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2013-05-29 14:16:28 +0000
@@ -81,7 +81,7 @@
 struct FakeInputServerConfiguration : public mir_test_framework::TestingServerConfiguration
 {
     FakeInputServerConfiguration()
-      : input_config(the_event_filters(), the_display(), std::shared_ptr<mi::CursorListener>())
+      : input_config(the_event_filters(), the_display(), std::shared_ptr<mi::CursorListener>(), the_input_report())
     {
     }
 

=== modified file 'tests/acceptance-tests/test_server_shutdown.cpp'
--- tests/acceptance-tests/test_server_shutdown.cpp	2013-05-21 15:11:41 +0000
+++ tests/acceptance-tests/test_server_shutdown.cpp	2013-05-29 14:16:28 +0000
@@ -205,7 +205,8 @@
                     std::make_shared<mtd::FakeEventHubInputConfiguration>(
                         std::initializer_list<std::shared_ptr<mi::EventFilter> const>{},
                         the_viewable_area(),
-                        std::shared_ptr<mi::CursorListener>());
+                        std::shared_ptr<mi::CursorListener>(),
+                        the_input_report());
             }
 
             return input_configuration;

=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
--- tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-04-30 20:44:31 +0000
+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-05-29 14:16:28 +0000
@@ -21,6 +21,7 @@
 #include "src/server/input/android/android_input_manager.h"
 #include "src/server/input/android/default_android_input_configuration.h"
 #include "mir/input/cursor_listener.h"
+#include "mir/input/null_input_report.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test/fake_event_hub.h"
@@ -70,7 +71,8 @@
         configuration = std::make_shared<mtd::FakeEventHubInputConfiguration>(
             std::initializer_list<std::shared_ptr<mi::EventFilter> const>{event_filter},
             mt::fake_shared(viewable_area),
-            mt::fake_shared(cursor_listener));
+            mt::fake_shared(cursor_listener),
+            std::make_shared<mi::NullInputReport>());
 
         ON_CALL(viewable_area, view_area())
             .WillByDefault(Return(visible_rectangle));

=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
--- tests/integration-tests/input/android/test_android_input_manager.cpp	2013-05-21 17:16:43 +0000
+++ tests/integration-tests/input/android/test_android_input_manager.cpp	2013-05-29 14:16:28 +0000
@@ -20,6 +20,7 @@
 #include "mir/input/event_filter.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/input/android/android_input_configuration.h"
+#include "mir/input/null_input_report.h"
 
 #include "src/server/input/android/default_android_input_configuration.h"
 #include "src/server/input/android/android_input_manager.h"
@@ -73,7 +74,7 @@
     AndroidInputManagerAndEventFilterDispatcherSetup()
     {
         event_filter = std::make_shared<MockEventFilter>();
-        configuration = std::make_shared<mtd::FakeEventHubInputConfiguration>(std::initializer_list<std::shared_ptr<mi::EventFilter> const>{event_filter}, mt::fake_shared(viewable_area), null_cursor_listener);
+        configuration = std::make_shared<mtd::FakeEventHubInputConfiguration>(std::initializer_list<std::shared_ptr<mi::EventFilter> const>{event_filter}, mt::fake_shared(viewable_area), null_cursor_listener, std::make_shared<mi::NullInputReport>());
         ON_CALL(viewable_area, view_area())
             .WillByDefault(Return(default_view_area));
 
@@ -218,8 +219,9 @@
 {
     TestingInputConfiguration(std::shared_ptr<mi::EventFilter> const& filter,
                               std::shared_ptr<mg::ViewableArea> const& view_area,
-                              std::shared_ptr<mi::CursorListener> const& cursor_listener)
-        : FakeEventHubInputConfiguration({}, view_area, cursor_listener),
+                              std::shared_ptr<mi::CursorListener> const& cursor_listener,
+                              std::shared_ptr<mi::InputReport> const& input_report)
+        : FakeEventHubInputConfiguration({}, view_area, cursor_listener, input_report),
           dispatcher_policy(new MockDispatcherPolicy(filter))
     {
     }
@@ -242,7 +244,7 @@
         event_filter = std::make_shared<MockEventFilter>();
         configuration = std::make_shared<TestingInputConfiguration>(
             event_filter,
-            mt::fake_shared(viewable_area), null_cursor_listener);
+            mt::fake_shared(viewable_area), null_cursor_listener, std::make_shared<mi::NullInputReport>());
         fake_event_hub = configuration->the_fake_event_hub();
 
         ON_CALL(viewable_area, view_area())

=== modified file 'tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp'
--- tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp	2013-05-02 00:11:18 +0000
+++ tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp	2013-05-29 14:16:28 +0000
@@ -16,11 +16,13 @@
  * Authored by: Robert Carr <[e-mail]>
  *              Daniel d'Andrada <[e-mail]>
  */
-#include "mir/input/event_filter.h"
 #include "src/server/input/android/event_filter_dispatcher_policy.h"
 #include "src/server/input/android/rudimentary_input_reader_policy.h"
 #include "src/server/input/android/android_input_constants.h"
 
+#include "mir/input/event_filter.h"
+#include "mir/input/null_input_report.h"
+
 #include "mir_test/fake_shared.h"
 #include "mir_test/fake_event_hub.h"
 #include "mir_test_doubles/mock_event_filter.h"
@@ -59,7 +61,7 @@
         event_hub = new mia::FakeEventHub();
         dispatcher_policy = new mia::EventFilterDispatcherPolicy(mt::fake_shared(event_filter), false);
         reader_policy = new mia::RudimentaryInputReaderPolicy();
-        dispatcher = new droidinput::InputDispatcher(dispatcher_policy);
+        dispatcher = new droidinput::InputDispatcher(dispatcher_policy, std::make_shared<mi::NullInputReport>());
         reader = new droidinput::InputReader(event_hub, reader_policy, dispatcher);
         reader_thread = new droidinput::InputReaderThread(reader);
         dispatcher_thread = new droidinput::InputDispatcherThread(dispatcher);

=== modified file 'tests/mir_test_doubles/fake_event_hub_input_configuration.cpp'
--- tests/mir_test_doubles/fake_event_hub_input_configuration.cpp	2013-04-24 05:22:20 +0000
+++ tests/mir_test_doubles/fake_event_hub_input_configuration.cpp	2013-05-29 14:16:28 +0000
@@ -26,9 +26,10 @@
 
 mtd::FakeEventHubInputConfiguration::FakeEventHubInputConfiguration(
     std::initializer_list<std::shared_ptr<mir::input::EventFilter> const> const& filters,
-    std::shared_ptr<mir::graphics::ViewableArea> const& view_area,
-    std::shared_ptr<mir::input::CursorListener> const& cursor_listener)
-      : DefaultInputConfiguration(filters, view_area, cursor_listener)
+    std::shared_ptr<mg::ViewableArea> const& view_area,
+    std::shared_ptr<mi::CursorListener> const& cursor_listener,
+    std::shared_ptr<mi::InputReport> const& input_report)
+      : DefaultInputConfiguration(filters, view_area, cursor_listener, input_report)
 {
     event_hub = new mia::FakeEventHub();
 }

=== modified file 'tests/unit-tests/logging/CMakeLists.txt'
--- tests/unit-tests/logging/CMakeLists.txt	2013-05-10 17:54:34 +0000
+++ tests/unit-tests/logging/CMakeLists.txt	2013-05-29 14:16:28 +0000
@@ -1,6 +1,6 @@
 list(APPEND UNIT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/message_processor_report.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_input_report.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_legacy_input_report.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test_display_report.cpp
 )
 

=== renamed file 'tests/unit-tests/logging/test_input_report.cpp' => 'tests/unit-tests/logging/test_legacy_input_report.cpp'
--- tests/unit-tests/logging/test_input_report.cpp	2013-05-04 00:04:19 +0000
+++ tests/unit-tests/logging/test_legacy_input_report.cpp	2013-05-29 14:16:28 +0000
@@ -27,7 +27,7 @@
 #include <gmock/gmock.h>
 
 namespace ml  = mir::logging;
-namespace mli = mir::logging::input_report;
+namespace mli = mir::logging::legacy_input_report;
 
 namespace
 {