1
=== modified file 'src/include/server/mir/input/input_probe.h'
2
--- src/include/server/mir/input/input_probe.h	2016-03-02 14:54:07 +0000
3
+++ src/include/server/mir/input/input_probe.h	2016-03-08 16:22:46 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2016 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
10
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU General Public License version 3,
11
@@ -23,6 +23,7 @@
12
23
23
13
24
namespace mir
24
namespace mir
14
25
{
25
{
15
26
namespace graphics { class Platform; }
16
26
namespace options
27
namespace options
17
27
{
28
{
18
28
class Option;
29
class Option;
19
@@ -41,6 +42,12 @@
20
41
    std::shared_ptr<InputDeviceRegistry> const& device_registry, std::shared_ptr<InputReport> const& input_report,
42
    std::shared_ptr<InputDeviceRegistry> const& device_registry, std::shared_ptr<InputReport> const& input_report,
21
42
    SharedLibraryProberReport & prober_report);
43
    SharedLibraryProberReport & prober_report);
22
43
44
23
45
/// Tries to create an input platform from the graphics module, otherwise returns a null pointer
24
46
auto input_platform_from_graphics_module(
25
47
    graphics::Platform const& graphics_platform,
26
48
    options::Option const& options, std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup,
27
49
    std::shared_ptr<InputDeviceRegistry> const& device_registry, std::shared_ptr<InputReport> const& input_report)
28
50
-> mir::UniqueModulePtr<Platform>;
29
44
}
51
}
30
45
}
52
}
31
46
53
32
47
54
33
=== modified file 'src/server/input/default_configuration.cpp'
34
--- src/server/input/default_configuration.cpp	2016-03-02 16:38:13 +0000
35
+++ src/server/input/default_configuration.cpp	2016-03-08 16:22:46 +0000
36
@@ -233,15 +233,32 @@
37
233
            auto const options = the_options();
233
            auto const options = the_options();
38
234
            bool input_opt = options->get<bool>(options::enable_input_opt);
234
            bool input_opt = options->get<bool>(options::enable_input_opt);
39
235
235
43
236
            // TODO nested input handling (== host_socket) should fold into a platform
236
            if (!input_opt)
44
237
            if (!input_opt || options->is_set(options::host_socket_opt))
237
            {
45
238
            {
238
                return std::make_shared<mi::NullInputManager>();
46
239
            }
47
240
            else if (options->is_set(options::host_socket_opt))
48
241
            {
49
242
                // TODO nested input handling (== host_socket) should fold into a platform
50
239
                return std::make_shared<mi::NullInputManager>();
243
                return std::make_shared<mi::NullInputManager>();
51
240
            }
244
            }
52
241
            else
245
            else
53
242
            {
246
            {
56
243
                auto platform = probe_input_platforms(*options, the_emergency_cleanup(), the_input_device_registry(),
247
                auto const emergency_cleanup = the_emergency_cleanup();
57
244
                                                       the_input_report(), *the_shared_library_prober_report());
248
                auto const device_registry = the_input_device_registry();
58
249
                auto const input_report = the_input_report();
59
250
60
251
                // Maybe the graphics platform also supplies input (e.g. mesa-x11 or nested)
61
252
                // NB this makes the (valid) assumption that graphics initializes before input
62
253
                auto platform = mi::input_platform_from_graphics_module(
63
254
                    *the_graphics_platform(), *options, emergency_cleanup, device_registry, input_report);
64
255
65
256
                // otherwise (usually) we probe for it
66
257
                if (!platform)
67
258
                {
68
259
                    platform = probe_input_platforms(*options, emergency_cleanup, device_registry,
69
260
                                                     input_report, *the_shared_library_prober_report());
70
261
                }
71
245
262
72
246
                return std::make_shared<mi::DefaultInputManager>(the_input_reading_multiplexer(), std::move(platform));
263
                return std::make_shared<mi::DefaultInputManager>(the_input_reading_multiplexer(), std::move(platform));
73
247
            }
264
            }
74
248
265
75
=== modified file 'src/server/input/input_probe.cpp'
76
--- src/server/input/input_probe.cpp	2016-03-03 09:30:33 +0000
77
+++ src/server/input/input_probe.cpp	2016-03-08 16:22:46 +0000
78
@@ -1,5 +1,5 @@
79
1
/*
1
/*
81
2
 * Copyright © 2015 Canonical Ltd.
2
 * Copyright © 2015-2016 Canonical Ltd.
82
3
 *
3
 *
83
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
84
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU General Public License version 3,
85
@@ -25,7 +25,7 @@
86
25
#include "mir/shared_library_prober.h"
25
#include "mir/shared_library_prober.h"
87
26
#include "mir/shared_library.h"
26
#include "mir/shared_library.h"
88
27
#include "mir/log.h"
27
#include "mir/log.h"
90
28
#include "mir/module_deleter.h"
28
#include "mir/libname.h"
91
29
29
92
30
#include <stdexcept>
30
#include <stdexcept>
93
31
31
94
@@ -39,10 +39,16 @@
95
39
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& cleanup_registry,
39
    std::shared_ptr<mir::EmergencyCleanupRegistry> const& cleanup_registry,
96
40
    std::shared_ptr<mi::InputDeviceRegistry> const& registry, std::shared_ptr<mi::InputReport> const& report)
40
    std::shared_ptr<mi::InputDeviceRegistry> const& registry, std::shared_ptr<mi::InputReport> const& report)
97
41
{
41
{
99
42
42
    auto desc = lib.load_function<mi::DescribeModule>("describe_input_module", MIR_SERVER_INPUT_PLATFORM_VERSION)();
100
43
    auto create = lib.load_function<mi::CreatePlatform>("create_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
43
    auto create = lib.load_function<mi::CreatePlatform>("create_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
101
44
44
103
45
    return create(options, cleanup_registry, registry, report);
45
    auto result = create(options, cleanup_registry, registry, report);
104
46
105
47
    mir::log_info(
106
48
        "Selected input driver: %s (version: %d.%d.%d)",
107
49
        desc->name, desc->major_version, desc->minor_version, desc->micro_version);
108
50
109
51
    return result;
110
46
}
52
}
111
47
}
53
}
112
48
54
113
@@ -63,12 +69,6 @@
114
63
                auto const probe = module->load_function<mi::ProbePlatform>(
69
                auto const probe = module->load_function<mi::ProbePlatform>(
115
64
                    "probe_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
70
                    "probe_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
116
65
71
117
66
                // We process the modules in descending .sonumber order so, luckily, we try mesa-x11 before evdev.
118
67
                // But only because the graphics platform version is currently higher than the input platform version.
119
68
                // Similarly, We only take the first found of duplicate modules, as that will be the most recent.
120
69
                // This is a heuristic that assumes we're always looking for the most up-to-date driver,
121
70
                // TODO find a way to coordinate the selection of mesa-x11 and input platforms
122
71
123
72
                if (probe(options) > reject_platform_priority)
72
                if (probe(options) > reject_platform_priority)
124
73
                {
73
                {
125
74
                    platform_module = module;
74
                    platform_module = module;
126
@@ -97,14 +97,28 @@
127
97
    if (!platform_module)
97
    if (!platform_module)
128
98
        BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate input platform module found"});
98
        BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate input platform module found"});
129
99
99
140
100
    auto const desc = platform_module->load_function<mi::DescribeModule>(
100
    return create_input_platform(*platform_module, options, emergency_cleanup, device_registry, input_report);
141
101
        "describe_input_module", MIR_SERVER_INPUT_PLATFORM_VERSION)();
101
}
142
102
102
143
103
    auto result = create_input_platform(*platform_module, options, emergency_cleanup, device_registry, input_report);
103
auto mi::input_platform_from_graphics_module(
144
104
104
    graphics::Platform const& graphics_platform,
145
105
    mir::log_info(
105
    options::Option const& options,
146
106
        "Selected input driver: %s (version: %d.%d.%d)",
106
    std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup,
147
107
        desc->name, desc->major_version, desc->minor_version, desc->micro_version);
107
    std::shared_ptr<InputDeviceRegistry> const& device_registry,
148
108
108
    std::shared_ptr<InputReport> const& input_report)
149
109
    return result;
109
-> mir::UniqueModulePtr<Platform>
150
110
{
151
111
    try
152
112
    {
153
113
        // Yes, this is dirty code that assumes the object layout. Sorry!
154
114
        auto* const vtab = (void*&)(graphics_platform);
155
115
        SharedLibrary const platform_module{detail::libname_impl(vtab)};
156
116
157
117
        return create_input_platform(platform_module, options, emergency_cleanup, device_registry, input_report);
158
118
    }
159
119
    catch (std::runtime_error const&)
160
120
    {
161
121
        // Assume the graphics platform is not also an input module.
162
122
        return {};
163
123
    }
164
110
}
124
}
Status:	Merged
Approved by:	Alan Griffiths on 2016-03-08
Approved revision:	no longer in the source branch.
Merged at revision:	3377
Proposed branch:	lp:~alan-griffiths/mir/spike-input-from-the-existing-graphics-module
Merge into:	lp:mir
Prerequisite:	lp:~alan-griffiths/mir/fix-1528110
Diff against target:	164 lines (+64/-26) 3 files modified src/include/server/mir/input/input_probe.h (+8/-1) src/server/input/default_configuration.cpp (+22/-5) src/server/input/input_probe.cpp (+34/-20)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/spike-input-from-the-existing-graphics-module
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-03-08
Chris Halse Rogers			Approve on 2016-03-04
Cemil Azizoglu (community)		2016-03-03	Approve on 2016-03-03
Review via email: mp+287964@code.launchpad.net
1	=== modified file 'src/include/server/mir/input/input_probe.h'
2	--- src/include/server/mir/input/input_probe.h 2016-03-02 14:54:07 +0000
3	+++ src/include/server/mir/input/input_probe.h 2016-03-08 16:22:46 +0000
4	@@ -1,5 +1,5 @@
5	1	/*	1	/*
7	2	* Copyright © 2015 Canonical Ltd.	2	* Copyright © 2015-2016 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
10	5	* under the terms of the GNU General Public License version 3,	5	* under the terms of the GNU General Public License version 3,
11	@@ -23,6 +23,7 @@
12	23		23
13	24	namespace mir	24	namespace mir
14	25	{	25	{
15			26	namespace graphics { class Platform; }
16	26	namespace options	27	namespace options
17	27	{	28	{
18	28	class Option;	29	class Option;
19	@@ -41,6 +42,12 @@
20	41	std::shared_ptr<InputDeviceRegistry> const& device_registry, std::shared_ptr<InputReport> const& input_report,	42	std::shared_ptr<InputDeviceRegistry> const& device_registry, std::shared_ptr<InputReport> const& input_report,
21	42	SharedLibraryProberReport & prober_report);	43	SharedLibraryProberReport & prober_report);
22	43		44
23			45	/// Tries to create an input platform from the graphics module, otherwise returns a null pointer
24			46	auto input_platform_from_graphics_module(
25			47	graphics::Platform const& graphics_platform,
26			48	options::Option const& options, std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup,
27			49	std::shared_ptr<InputDeviceRegistry> const& device_registry, std::shared_ptr<InputReport> const& input_report)
28			50	-> mir::UniqueModulePtr<Platform>;
29	44	}	51	}
30	45	}	52	}
31	46		53
32	47		54
33	=== modified file 'src/server/input/default_configuration.cpp'
34	--- src/server/input/default_configuration.cpp 2016-03-02 16:38:13 +0000
35	+++ src/server/input/default_configuration.cpp 2016-03-08 16:22:46 +0000
36	@@ -233,15 +233,32 @@
37	233	auto const options = the_options();	233	auto const options = the_options();
38	234	bool input_opt = options->get<bool>(options::enable_input_opt);	234	bool input_opt = options->get<bool>(options::enable_input_opt);
39	235		235
43	236	// TODO nested input handling (== host_socket) should fold into a platform	236	if (!input_opt)
44	237	if (!input_opt \|\| options->is_set(options::host_socket_opt))	237	{
45	238	{	238	return std::make_shared<mi::NullInputManager>();
46			239	}
47			240	else if (options->is_set(options::host_socket_opt))
48			241	{
49			242	// TODO nested input handling (== host_socket) should fold into a platform
50	239	return std::make_shared<mi::NullInputManager>();	243	return std::make_shared<mi::NullInputManager>();
51	240	}	244	}
52	241	else	245	else
53	242	{	246	{
56	243	auto platform = probe_input_platforms(*options, the_emergency_cleanup(), the_input_device_registry(),	247	auto const emergency_cleanup = the_emergency_cleanup();
57	244	the_input_report(), *the_shared_library_prober_report());	248	auto const device_registry = the_input_device_registry();
58			249	auto const input_report = the_input_report();
59			250
60			251	// Maybe the graphics platform also supplies input (e.g. mesa-x11 or nested)
61			252	// NB this makes the (valid) assumption that graphics initializes before input
62			253	auto platform = mi::input_platform_from_graphics_module(
63			254	the_graphics_platform(), options, emergency_cleanup, device_registry, input_report);
64			255
65			256	// otherwise (usually) we probe for it
66			257	if (!platform)
67			258	{
68			259	platform = probe_input_platforms(*options, emergency_cleanup, device_registry,
69			260	input_report, *the_shared_library_prober_report());
70			261	}
71	245		262
72	246	return std::make_shared<mi::DefaultInputManager>(the_input_reading_multiplexer(), std::move(platform));	263	return std::make_shared<mi::DefaultInputManager>(the_input_reading_multiplexer(), std::move(platform));
73	247	}	264	}
74	248		265
75	=== modified file 'src/server/input/input_probe.cpp'
76	--- src/server/input/input_probe.cpp 2016-03-03 09:30:33 +0000
77	+++ src/server/input/input_probe.cpp 2016-03-08 16:22:46 +0000
78	@@ -1,5 +1,5 @@
79	1	/*	1	/*
81	2	* Copyright © 2015 Canonical Ltd.	2	* Copyright © 2015-2016 Canonical Ltd.
82	3	*	3	*
83	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
84	5	* under the terms of the GNU General Public License version 3,	5	* under the terms of the GNU General Public License version 3,
85	@@ -25,7 +25,7 @@
86	25	#include "mir/shared_library_prober.h"	25	#include "mir/shared_library_prober.h"
87	26	#include "mir/shared_library.h"	26	#include "mir/shared_library.h"
88	27	#include "mir/log.h"	27	#include "mir/log.h"
90	28	#include "mir/module_deleter.h"	28	#include "mir/libname.h"
91	29		29
92	30	#include <stdexcept>	30	#include <stdexcept>
93	31		31
94	@@ -39,10 +39,16 @@
95	39	std::shared_ptr<mir::EmergencyCleanupRegistry> const& cleanup_registry,	39	std::shared_ptr<mir::EmergencyCleanupRegistry> const& cleanup_registry,
96	40	std::shared_ptr<mi::InputDeviceRegistry> const& registry, std::shared_ptr<mi::InputReport> const& report)	40	std::shared_ptr<mi::InputDeviceRegistry> const& registry, std::shared_ptr<mi::InputReport> const& report)
97	41	{	41	{
99	42		42	auto desc = lib.load_function<mi::DescribeModule>("describe_input_module", MIR_SERVER_INPUT_PLATFORM_VERSION)();
100	43	auto create = lib.load_function<mi::CreatePlatform>("create_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);	43	auto create = lib.load_function<mi::CreatePlatform>("create_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
101	44		44
103	45	return create(options, cleanup_registry, registry, report);	45	auto result = create(options, cleanup_registry, registry, report);
104			46
105			47	mir::log_info(
106			48	"Selected input driver: %s (version: %d.%d.%d)",
107			49	desc->name, desc->major_version, desc->minor_version, desc->micro_version);
108			50
109			51	return result;
110	46	}	52	}
111	47	}	53	}
112	48		54
113	@@ -63,12 +69,6 @@
114	63	auto const probe = module->load_function<mi::ProbePlatform>(	69	auto const probe = module->load_function<mi::ProbePlatform>(
115	64	"probe_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);	70	"probe_input_platform", MIR_SERVER_INPUT_PLATFORM_VERSION);
116	65		71
117	66	// We process the modules in descending .sonumber order so, luckily, we try mesa-x11 before evdev.
118	67	// But only because the graphics platform version is currently higher than the input platform version.
119	68	// Similarly, We only take the first found of duplicate modules, as that will be the most recent.
120	69	// This is a heuristic that assumes we're always looking for the most up-to-date driver,
121	70	// TODO find a way to coordinate the selection of mesa-x11 and input platforms
122	71
123	72	if (probe(options) > reject_platform_priority)	72	if (probe(options) > reject_platform_priority)
124	73	{	73	{
125	74	platform_module = module;	74	platform_module = module;
126	@@ -97,14 +97,28 @@
127	97	if (!platform_module)	97	if (!platform_module)
128	98	BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate input platform module found"});	98	BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate input platform module found"});
129	99		99
140	100	auto const desc = platform_module->load_function<mi::DescribeModule>(	100	return create_input_platform(*platform_module, options, emergency_cleanup, device_registry, input_report);
141	101	"describe_input_module", MIR_SERVER_INPUT_PLATFORM_VERSION)();	101	}
142	102		102
143	103	auto result = create_input_platform(*platform_module, options, emergency_cleanup, device_registry, input_report);	103	auto mi::input_platform_from_graphics_module(
144	104		104	graphics::Platform const& graphics_platform,
145	105	mir::log_info(	105	options::Option const& options,
146	106	"Selected input driver: %s (version: %d.%d.%d)",	106	std::shared_ptr<EmergencyCleanupRegistry> const& emergency_cleanup,
147	107	desc->name, desc->major_version, desc->minor_version, desc->micro_version);	107	std::shared_ptr<InputDeviceRegistry> const& device_registry,
148	108		108	std::shared_ptr<InputReport> const& input_report)
149	109	return result;	109	-> mir::UniqueModulePtr<Platform>
150			110	{
151			111	try
152			112	{
153			113	// Yes, this is dirty code that assumes the object layout. Sorry!
154			114	auto* const vtab = (void*&)(graphics_platform);
155			115	SharedLibrary const platform_module{detail::libname_impl(vtab)};
156			116
157			117	return create_input_platform(platform_module, options, emergency_cleanup, device_registry, input_report);
158			118	}
159			119	catch (std::runtime_error const&)
160			120	{
161			121	// Assume the graphics platform is not also an input module.
162			122	return {};
163			123	}
164	110	}	124	}