Merge lp:~andreas-pokorny/mir/move-input-report into lp:mir

[Andreas Pokorny]

Move InputReport interface from server to mir platform and LGPL

Moves Input Report to a location accessible by platforms, and changes licensing to LGPL

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2320
http://jenkins.qa.ubuntu.com/job/mir-ci/3247/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1676
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1244
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1630
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1630/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4639
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18908

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm,
nit:
79 + void open_input_device(char const* device_name, char const* input_platform) override;
80 + void failure_opening_input_device(char const* device_name, char const* input_platform) override;

opened_input_device(...), failed_to_open_input_device(...)
make it clearer that we are reporting something that happened in the past, as opposed to trying to open an input device from the function.

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2321
http://jenkins.qa.ubuntu.com/job/mir-ci/3262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1259
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1645
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1645/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4649
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18933

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Andreas Pokorny (andreas-pokorny)]

waits for the prereq to be merged...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2322
http://jenkins.qa.ubuntu.com/job/mir-ci/3295/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1733/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1687/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1292/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1687/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2323
http://jenkins.qa.ubuntu.com/job/mir-ci/3301/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1741
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1298
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1298/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1694
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1694/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4689
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19037

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Un-TA'd as prerequisite is still in review

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2325
http://jenkins.qa.ubuntu.com/job/mir-ci/3380/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1843
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1377
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1794
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1794/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4750
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19193

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

review: Approve (continuous-integration)

=== renamed file 'src/include/server/mir/input/input_report.h' => 'include/platform/mir/input/input_report.h'
--- src/include/server/mir/input/input_report.h	2015-01-21 07:34:50 +0000
+++ include/platform/mir/input/input_report.h	2015-03-26 11:59:41 +0000
@@ -1,16 +1,16 @@
 /*
- * Copyright © 2013 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,
+ * under the terms of the GNU Lesser 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.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Alan Griffiths <[e-mail]>
@@ -40,6 +40,9 @@
 
     virtual void received_event_finished_signal(int src_fd, uint32_t seq_id) = 0;
 
+    virtual void opened_input_device(char const* device_name, char const* input_platform) = 0;
+    virtual void failed_to_open_input_device(char const* device_name, char const* input_platform) = 0;
+
 protected:
     InputReport() = default;
     InputReport(InputReport const&) = delete;

=== modified file 'src/server/report/logging/input_report.cpp'
--- src/server/report/logging/input_report.cpp	2015-03-24 16:02:48 +0000
+++ src/server/report/logging/input_report.cpp	2015-03-26 11:59:41 +0000
@@ -154,3 +154,25 @@
 
     logger->log(ml::Severity::informational, ss.str(), component());
 }
+
+void mrl::InputReport::opened_input_device(char const* device_name, char const* input_platform)
+{
+    std::stringstream ss;
+
+    ss << "Input device opened "
+       << " name=" << device_name
+       << " platform=" << input_platform;
+
+    logger->log(ml::Severity::informational, ss.str(), component());
+}
+
+void mrl::InputReport::failed_to_open_input_device(char const* device_name, char const* input_platform)
+{
+    std::stringstream ss;
+
+    ss << "Failure opening input device "
+       << " name=" << device_name
+       << " platform=" << input_platform;
+
+    logger->log(ml::Severity::informational, ss.str(), component());
+}

=== modified file 'src/server/report/logging/input_report.h'
--- src/server/report/logging/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/logging/input_report.h	2015-03-26 11:59:41 +0000
@@ -40,13 +40,15 @@
     InputReport(std::shared_ptr<mir::logging::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);
-
+    void received_event_from_kernel(int64_t when, int type, int code, int value) override;
+
+    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
+    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
+
+    void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
+
+    void opened_input_device(char const* device_name, char const* input_platform) override;
+    void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
 private:
     char const* component();
     std::shared_ptr<mir::logging::Logger> const logger;

=== modified file 'src/server/report/lttng/input_report.cpp'
--- src/server/report/lttng/input_report.cpp	2014-03-06 06:05:17 +0000
+++ src/server/report/lttng/input_report.cpp	2015-03-26 11:59:41 +0000
@@ -43,3 +43,13 @@
 {
     mir_tracepoint(mir_server_input, received_event_finished_signal, src_fd, seq_id);
 }
+
+void mir::report::lttng::InputReport::opened_input_device(char const* name, char const* platform)
+{
+    mir_tracepoint(mir_server_input, opened_input_device, name, platform);
+}
+
+void mir::report::lttng::InputReport::failed_to_open_input_device(char const* name, char const* platform)
+{
+    mir_tracepoint(mir_server_input, failed_to_open_input_device, name, platform);
+}

=== modified file 'src/server/report/lttng/input_report.h'
--- src/server/report/lttng/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/lttng/input_report.h	2015-03-26 11:59:41 +0000
@@ -43,6 +43,8 @@
 
     void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
 
+    void opened_input_device(char const* device_name, char const* input_platform) override;
+    void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
 private:
     ServerTracepointProvider tp_provider;
 };

=== modified file 'src/server/report/lttng/input_report_tp.h'
--- src/server/report/lttng/input_report_tp.h	2015-01-21 07:34:50 +0000
+++ src/server/report/lttng/input_report_tp.h	2015-03-26 11:59:41 +0000
@@ -71,6 +71,26 @@
     )
 )
 
+TRACEPOINT_EVENT(
+    mir_server_input,
+    opened_input_device,
+    TP_ARGS(const char*, device, const char*, platform),
+    TP_FIELDS(
+        ctf_string(device, device)
+        ctf_string(platform, platform)
+    )
+)
+
+TRACEPOINT_EVENT(
+    mir_server_input,
+    failed_to_open_input_device,
+    TP_ARGS(const char*, device, const char*, platform),
+    TP_FIELDS(
+        ctf_string(device, device)
+        ctf_string(platform, platform)
+    )
+)
+
 #endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
 
 #include <lttng/tracepoint-event.h>

=== modified file 'src/server/report/null/input_report.cpp'
--- src/server/report/null/input_report.cpp	2014-03-06 06:05:17 +0000
+++ src/server/report/null/input_report.cpp	2015-03-26 11:59:41 +0000
@@ -36,4 +36,10 @@
 {
 }
 
+void mrn::InputReport::opened_input_device(char const* /* name */, char const* /* platform */)
+{
+}
 
+void mrn::InputReport::failed_to_open_input_device(char const* /* name */, char const* /* platform */)
+{
+}

=== modified file 'src/server/report/null/input_report.h'
--- src/server/report/null/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/null/input_report.h	2015-03-26 11:59:41 +0000
@@ -35,12 +35,15 @@
     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);
+    void received_event_from_kernel(int64_t when, int type, int code, int value) override;
+
+    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
+    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
+
+    void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
+
+    void opened_input_device(char const* device_name, char const* input_platform) override;
+    void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
 };
 
 }