1
=== renamed file 'src/include/server/mir/input/input_report.h' => 'include/platform/mir/input/input_report.h'
2
--- src/include/server/mir/input/input_report.h	2015-01-21 07:34:50 +0000
3
+++ include/platform/mir/input/input_report.h	2015-03-26 11:59:41 +0000
4
@@ -1,16 +1,16 @@
5
1
/*
1
/*
7
2
 * Copyright © 2013 Canonical Ltd.
2
 * Copyright © 2013-2015 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
11
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU Lesser General Public License version 3,
12
6
 * as published by the Free Software Foundation.
6
 * as published by the Free Software Foundation.
13
7
 *
7
 *
14
8
 * This program is distributed in the hope that it will be useful,
8
 * This program is distributed in the hope that it will be useful,
15
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
11
 * GNU General Public License for more details.
11
 * GNU Lesser General Public License for more details.
19
12
 *
12
 *
21
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU Lesser General Public License
22
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
23
15
 *
15
 *
24
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
25
@@ -40,6 +40,9 @@
26
40
40
27
41
    virtual void received_event_finished_signal(int src_fd, uint32_t seq_id) = 0;
41
    virtual void received_event_finished_signal(int src_fd, uint32_t seq_id) = 0;
28
42
42
29
43
    virtual void opened_input_device(char const* device_name, char const* input_platform) = 0;
30
44
    virtual void failed_to_open_input_device(char const* device_name, char const* input_platform) = 0;
31
45
32
43
protected:
46
protected:
33
44
    InputReport() = default;
47
    InputReport() = default;
34
45
    InputReport(InputReport const&) = delete;
48
    InputReport(InputReport const&) = delete;
35
46
49
36
=== modified file 'src/server/report/logging/input_report.cpp'
37
--- src/server/report/logging/input_report.cpp	2015-03-24 16:02:48 +0000
38
+++ src/server/report/logging/input_report.cpp	2015-03-26 11:59:41 +0000
39
@@ -154,3 +154,25 @@
40
154
154
41
155
    logger->log(ml::Severity::informational, ss.str(), component());
155
    logger->log(ml::Severity::informational, ss.str(), component());
42
156
}
156
}
43
157
44
158
void mrl::InputReport::opened_input_device(char const* device_name, char const* input_platform)
45
159
{
46
160
    std::stringstream ss;
47
161
48
162
    ss << "Input device opened "
49
163
       << " name=" << device_name
50
164
       << " platform=" << input_platform;
51
165
52
166
    logger->log(ml::Severity::informational, ss.str(), component());
53
167
}
54
168
55
169
void mrl::InputReport::failed_to_open_input_device(char const* device_name, char const* input_platform)
56
170
{
57
171
    std::stringstream ss;
58
172
59
173
    ss << "Failure opening input device "
60
174
       << " name=" << device_name
61
175
       << " platform=" << input_platform;
62
176
63
177
    logger->log(ml::Severity::informational, ss.str(), component());
64
178
}
65
157
179
66
=== modified file 'src/server/report/logging/input_report.h'
67
--- src/server/report/logging/input_report.h	2014-03-06 06:05:17 +0000
68
+++ src/server/report/logging/input_report.h	2015-03-26 11:59:41 +0000
69
@@ -40,13 +40,15 @@
70
40
    InputReport(std::shared_ptr<mir::logging::Logger> const& logger);
40
    InputReport(std::shared_ptr<mir::logging::Logger> const& logger);
71
41
    virtual ~InputReport() noexcept(true) = default;
41
    virtual ~InputReport() noexcept(true) = default;
72
42
42
80
43
    void received_event_from_kernel(int64_t when, int type, int code, int value);
43
    void received_event_from_kernel(int64_t when, int type, int code, int value) override;
81
44
44
82
45
    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);
45
    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
83
46
    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);
46
    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
84
47
47
85
48
    void received_event_finished_signal(int src_fd, uint32_t seq_id);
48
    void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
86
49
49
87
50
    void opened_input_device(char const* device_name, char const* input_platform) override;
88
51
    void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
89
50
private:
52
private:
90
51
    char const* component();
53
    char const* component();
91
52
    std::shared_ptr<mir::logging::Logger> const logger;
54
    std::shared_ptr<mir::logging::Logger> const logger;
92
53
55
93
=== modified file 'src/server/report/lttng/input_report.cpp'
94
--- src/server/report/lttng/input_report.cpp	2014-03-06 06:05:17 +0000
95
+++ src/server/report/lttng/input_report.cpp	2015-03-26 11:59:41 +0000
96
@@ -43,3 +43,13 @@
97
43
{
43
{
98
44
    mir_tracepoint(mir_server_input, received_event_finished_signal, src_fd, seq_id);
44
    mir_tracepoint(mir_server_input, received_event_finished_signal, src_fd, seq_id);
99
45
}
45
}
100
46
101
47
void mir::report::lttng::InputReport::opened_input_device(char const* name, char const* platform)
102
48
{
103
49
    mir_tracepoint(mir_server_input, opened_input_device, name, platform);
104
50
}
105
51
106
52
void mir::report::lttng::InputReport::failed_to_open_input_device(char const* name, char const* platform)
107
53
{
108
54
    mir_tracepoint(mir_server_input, failed_to_open_input_device, name, platform);
109
55
}
110
46
56
111
=== modified file 'src/server/report/lttng/input_report.h'
112
--- src/server/report/lttng/input_report.h	2014-03-06 06:05:17 +0000
113
+++ src/server/report/lttng/input_report.h	2015-03-26 11:59:41 +0000
114
@@ -43,6 +43,8 @@
115
43
43
116
44
    void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
44
    void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
117
45
45
118
46
    void opened_input_device(char const* device_name, char const* input_platform) override;
119
47
    void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
120
46
private:
48
private:
121
47
    ServerTracepointProvider tp_provider;
49
    ServerTracepointProvider tp_provider;
122
48
};
50
};
123
49
51
124
=== modified file 'src/server/report/lttng/input_report_tp.h'
125
--- src/server/report/lttng/input_report_tp.h	2015-01-21 07:34:50 +0000
126
+++ src/server/report/lttng/input_report_tp.h	2015-03-26 11:59:41 +0000
127
@@ -71,6 +71,26 @@
128
71
    )
71
    )
129
72
)
72
)
130
73
73
131
74
TRACEPOINT_EVENT(
132
75
    mir_server_input,
133
76
    opened_input_device,
134
77
    TP_ARGS(const char*, device, const char*, platform),
135
78
    TP_FIELDS(
136
79
        ctf_string(device, device)
137
80
        ctf_string(platform, platform)
138
81
    )
139
82
)
140
83
141
84
TRACEPOINT_EVENT(
142
85
    mir_server_input,
143
86
    failed_to_open_input_device,
144
87
    TP_ARGS(const char*, device, const char*, platform),
145
88
    TP_FIELDS(
146
89
        ctf_string(device, device)
147
90
        ctf_string(platform, platform)
148
91
    )
149
92
)
150
93
151
74
#endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
94
#endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
152
75
95
153
76
#include <lttng/tracepoint-event.h>
96
#include <lttng/tracepoint-event.h>
154
77
97
155
=== modified file 'src/server/report/null/input_report.cpp'
156
--- src/server/report/null/input_report.cpp	2014-03-06 06:05:17 +0000
157
+++ src/server/report/null/input_report.cpp	2015-03-26 11:59:41 +0000
158
@@ -36,4 +36,10 @@
159
36
{
36
{
160
37
}
37
}
161
38
38
162
39
void mrn::InputReport::opened_input_device(char const* /* name */, char const* /* platform */)
163
40
{
164
41
}
165
39
42
166
43
void mrn::InputReport::failed_to_open_input_device(char const* /* name */, char const* /* platform */)
167
44
{
168
45
}
169
40
46
170
=== modified file 'src/server/report/null/input_report.h'
171
--- src/server/report/null/input_report.h	2014-03-06 06:05:17 +0000
172
+++ src/server/report/null/input_report.h	2015-03-26 11:59:41 +0000
173
@@ -35,12 +35,15 @@
174
35
    InputReport() = default;
35
    InputReport() = default;
175
36
    virtual ~InputReport() noexcept(true) = default;
36
    virtual ~InputReport() noexcept(true) = default;
176
37
37
183
38
    void received_event_from_kernel(int64_t when, int type, int code, int value);
38
    void received_event_from_kernel(int64_t when, int type, int code, int value) override;
184
39
39
185
40
    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);
40
    void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
186
41
    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);
41
    void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
187
42
42
188
43
    void received_event_finished_signal(int src_fd, uint32_t seq_id);
43
    void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
189
44
190
45
    void opened_input_device(char const* device_name, char const* input_platform) override;
191
46
    void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
192
44
};
47
};
193
45
48
194
46
}
49
}
Status:	Merged
Approved by:	Daniel van Vugt on 2015-03-30
Approved revision:	no longer in the source branch.
Merged at revision:	2440
Proposed branch:	lp:~andreas-pokorny/mir/move-input-report
Merge into:	lp:mir
Prerequisite:	lp:~andreas-pokorny/mir/stub-input-platform
Diff against target:	194 lines (+85/-17) 8 files modified include/platform/mir/input/input_report.h (+7/-4) src/server/report/logging/input_report.cpp (+22/-0) src/server/report/logging/input_report.h (+9/-7) src/server/report/lttng/input_report.cpp (+10/-0) src/server/report/lttng/input_report.h (+2/-0) src/server/report/lttng/input_report_tp.h (+20/-0) src/server/report/null/input_report.cpp (+6/-0) src/server/report/null/input_report.h (+9/-6)
To merge this branch:	bzr merge lp:~andreas-pokorny/mir/move-input-report
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-03-26
Alan Griffiths			Approve on 2015-03-18
Alexandros Frantzis (community)			Approve on 2015-03-18
Kevin DuBois (community)		2015-03-17	Approve on 2015-03-17
Review via email: mp+253207@code.launchpad.net
1	=== renamed file 'src/include/server/mir/input/input_report.h' => 'include/platform/mir/input/input_report.h'
2	--- src/include/server/mir/input/input_report.h 2015-01-21 07:34:50 +0000
3	+++ include/platform/mir/input/input_report.h 2015-03-26 11:59:41 +0000
4	@@ -1,16 +1,16 @@
5	1	/*	1	/*
7	2	* Copyright © 2013 Canonical Ltd.	2	* Copyright © 2013-2015 Canonical Ltd.
8	3	*	3	*
9	4	* This program is free software: you can redistribute it and/or modify it	4	* This program is free software: you can redistribute it and/or modify it
11	5	* under the terms of the GNU General Public License version 3,	5	* under the terms of the GNU Lesser General Public License version 3,
12	6	* as published by the Free Software Foundation.	6	* as published by the Free Software Foundation.
13	7	*	7	*
14	8	* This program is distributed in the hope that it will be useful,	8	* This program is distributed in the hope that it will be useful,
15	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of	9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
16	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18	11	* GNU General Public License for more details.	11	* GNU Lesser General Public License for more details.
19	12	*	12	*
21	13	* You should have received a copy of the GNU General Public License	13	* You should have received a copy of the GNU Lesser General Public License
22	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.	14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
23	15	*	15	*
24	16	* Authored by: Alan Griffiths <alan@octopull.co.uk>	16	* Authored by: Alan Griffiths <alan@octopull.co.uk>
25	@@ -40,6 +40,9 @@
26	40		40
27	41	virtual void received_event_finished_signal(int src_fd, uint32_t seq_id) = 0;	41	virtual void received_event_finished_signal(int src_fd, uint32_t seq_id) = 0;
28	42		42
29			43	virtual void opened_input_device(char const* device_name, char const* input_platform) = 0;
30			44	virtual void failed_to_open_input_device(char const* device_name, char const* input_platform) = 0;
31			45
32	43	protected:	46	protected:
33	44	InputReport() = default;	47	InputReport() = default;
34	45	InputReport(InputReport const&) = delete;	48	InputReport(InputReport const&) = delete;
35	46		49
36	=== modified file 'src/server/report/logging/input_report.cpp'
37	--- src/server/report/logging/input_report.cpp 2015-03-24 16:02:48 +0000
38	+++ src/server/report/logging/input_report.cpp 2015-03-26 11:59:41 +0000
39	@@ -154,3 +154,25 @@
40	154		154
41	155	logger->log(ml::Severity::informational, ss.str(), component());	155	logger->log(ml::Severity::informational, ss.str(), component());
42	156	}	156	}
43			157
44			158	void mrl::InputReport::opened_input_device(char const* device_name, char const* input_platform)
45			159	{
46			160	std::stringstream ss;
47			161
48			162	ss << "Input device opened "
49			163	<< " name=" << device_name
50			164	<< " platform=" << input_platform;
51			165
52			166	logger->log(ml::Severity::informational, ss.str(), component());
53			167	}
54			168
55			169	void mrl::InputReport::failed_to_open_input_device(char const* device_name, char const* input_platform)
56			170	{
57			171	std::stringstream ss;
58			172
59			173	ss << "Failure opening input device "
60			174	<< " name=" << device_name
61			175	<< " platform=" << input_platform;
62			176
63			177	logger->log(ml::Severity::informational, ss.str(), component());
64			178	}
65	157		179
66	=== modified file 'src/server/report/logging/input_report.h'
67	--- src/server/report/logging/input_report.h 2014-03-06 06:05:17 +0000
68	+++ src/server/report/logging/input_report.h 2015-03-26 11:59:41 +0000
69	@@ -40,13 +40,15 @@
70	40	InputReport(std::shared_ptr<mir::logging::Logger> const& logger);	40	InputReport(std::shared_ptr<mir::logging::Logger> const& logger);
71	41	virtual ~InputReport() noexcept(true) = default;	41	virtual ~InputReport() noexcept(true) = default;
72	42		42
80	43	void received_event_from_kernel(int64_t when, int type, int code, int value);	43	void received_event_from_kernel(int64_t when, int type, int code, int value) override;
81	44		44
82	45	void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);	45	void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
83	46	void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);	46	void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
84	47		47
85	48	void received_event_finished_signal(int src_fd, uint32_t seq_id);	48	void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
86	49		49
87			50	void opened_input_device(char const* device_name, char const* input_platform) override;
88			51	void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
89	50	private:	52	private:
90	51	char const* component();	53	char const* component();
91	52	std::shared_ptr<mir::logging::Logger> const logger;	54	std::shared_ptr<mir::logging::Logger> const logger;
92	53		55
93	=== modified file 'src/server/report/lttng/input_report.cpp'
94	--- src/server/report/lttng/input_report.cpp 2014-03-06 06:05:17 +0000
95	+++ src/server/report/lttng/input_report.cpp 2015-03-26 11:59:41 +0000
96	@@ -43,3 +43,13 @@
97	43	{	43	{
98	44	mir_tracepoint(mir_server_input, received_event_finished_signal, src_fd, seq_id);	44	mir_tracepoint(mir_server_input, received_event_finished_signal, src_fd, seq_id);
99	45	}	45	}
100			46
101			47	void mir::report::lttng::InputReport::opened_input_device(char const* name, char const* platform)
102			48	{
103			49	mir_tracepoint(mir_server_input, opened_input_device, name, platform);
104			50	}
105			51
106			52	void mir::report::lttng::InputReport::failed_to_open_input_device(char const* name, char const* platform)
107			53	{
108			54	mir_tracepoint(mir_server_input, failed_to_open_input_device, name, platform);
109			55	}
110	46		56
111	=== modified file 'src/server/report/lttng/input_report.h'
112	--- src/server/report/lttng/input_report.h 2014-03-06 06:05:17 +0000
113	+++ src/server/report/lttng/input_report.h 2015-03-26 11:59:41 +0000
114	@@ -43,6 +43,8 @@
115	43		43
116	44	void received_event_finished_signal(int src_fd, uint32_t seq_id) override;	44	void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
117	45		45
118			46	void opened_input_device(char const* device_name, char const* input_platform) override;
119			47	void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
120	46	private:	48	private:
121	47	ServerTracepointProvider tp_provider;	49	ServerTracepointProvider tp_provider;
122	48	};	50	};
123	49		51
124	=== modified file 'src/server/report/lttng/input_report_tp.h'
125	--- src/server/report/lttng/input_report_tp.h 2015-01-21 07:34:50 +0000
126	+++ src/server/report/lttng/input_report_tp.h 2015-03-26 11:59:41 +0000
127	@@ -71,6 +71,26 @@
128	71	)	71	)
129	72	)	72	)
130	73		73
131			74	TRACEPOINT_EVENT(
132			75	mir_server_input,
133			76	opened_input_device,
134			77	TP_ARGS(const char, device, const char, platform),
135			78	TP_FIELDS(
136			79	ctf_string(device, device)
137			80	ctf_string(platform, platform)
138			81	)
139			82	)
140			83
141			84	TRACEPOINT_EVENT(
142			85	mir_server_input,
143			86	failed_to_open_input_device,
144			87	TP_ARGS(const char, device, const char, platform),
145			88	TP_FIELDS(
146			89	ctf_string(device, device)
147			90	ctf_string(platform, platform)
148			91	)
149			92	)
150			93
151	74	#endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */	94	#endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
152	75		95
153	76	#include <lttng/tracepoint-event.h>	96	#include <lttng/tracepoint-event.h>
154	77		97
155	=== modified file 'src/server/report/null/input_report.cpp'
156	--- src/server/report/null/input_report.cpp 2014-03-06 06:05:17 +0000
157	+++ src/server/report/null/input_report.cpp 2015-03-26 11:59:41 +0000
158	@@ -36,4 +36,10 @@
159	36	{	36	{
160	37	}	37	}
161	38		38
162			39	void mrn::InputReport::opened_input_device(char const* /* name /, char const /* platform */)
163			40	{
164			41	}
165	39		42
166			43	void mrn::InputReport::failed_to_open_input_device(char const* /* name /, char const /* platform */)
167			44	{
168			45	}
169	40		46
170	=== modified file 'src/server/report/null/input_report.h'
171	--- src/server/report/null/input_report.h 2014-03-06 06:05:17 +0000
172	+++ src/server/report/null/input_report.h 2015-03-26 11:59:41 +0000
173	@@ -35,12 +35,15 @@
174	35	InputReport() = default;	35	InputReport() = default;
175	36	virtual ~InputReport() noexcept(true) = default;	36	virtual ~InputReport() noexcept(true) = default;
176	37		37
183	38	void received_event_from_kernel(int64_t when, int type, int code, int value);	38	void received_event_from_kernel(int64_t when, int type, int code, int value) override;
184	39		39
185	40	void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);	40	void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
186	41	void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);	41	void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) override;
187	42		42
188	43	void received_event_finished_signal(int src_fd, uint32_t seq_id);	43	void received_event_finished_signal(int src_fd, uint32_t seq_id) override;
189			44
190			45	void opened_input_device(char const* device_name, char const* input_platform) override;
191			46	void failed_to_open_input_device(char const* device_name, char const* input_platform) override;
192	44	};	47	};
193	45		48
194	46	}	49	}