1
=== modified file 'src/client/probing_client_platform_factory.cpp'
2
--- src/client/probing_client_platform_factory.cpp	2016-01-29 08:18:22 +0000
3
+++ src/client/probing_client_platform_factory.cpp	2016-01-29 12:17:29 +0000
4
@@ -31,6 +31,25 @@
5
31
    // than it takes to choose the right one. So this list is local:
31
    // than it takes to choose the right one. So this list is local:
6
32
    std::vector<std::shared_ptr<mir::SharedLibrary>> platform_modules;
32
    std::vector<std::shared_ptr<mir::SharedLibrary>> platform_modules;
7
33
33
8
34
    auto const module_selector = [context, &platform_modules](std::shared_ptr<mir::SharedLibrary> const& module)
9
35
    {
10
36
        try
11
37
        {
12
38
            auto probe = module->load_function<ClientPlatformProbe>("is_appropriate_module", CLIENT_PLATFORM_VERSION);
13
39
            if (probe(context))
14
40
            {
15
41
                platform_modules.push_back(module);
16
42
                return Selection::quit;
17
43
            }
18
44
        }
19
45
        catch (std::runtime_error const&)
20
46
        {
21
47
            // Assume we were handed a SharedLibrary that's not a client platform module of the correct vintage.
22
48
        }
23
49
24
50
        return Selection::persist;
25
51
    };
26
52
27
34
    if (!platform_overrides.empty())
53
    if (!platform_overrides.empty())
28
35
    {
54
    {
29
36
        // Even forcing a choice, platform is only loaded on demand. It's good
55
        // Even forcing a choice, platform is only loaded on demand. It's good
30
@@ -39,37 +58,19 @@
31
39
        // if you really wanted to.
58
        // if you really wanted to.
32
40
59
33
41
        for (auto const& platform : platform_overrides)
60
        for (auto const& platform : platform_overrides)
36
42
            platform_modules.push_back(
61
            module_selector(std::make_shared<mir::SharedLibrary>(platform));
35
43
                std::make_shared<mir::SharedLibrary>(platform));
37
44
    }
62
    }
38
45
    else
63
    else
39
46
    {
64
    {
40
47
        for (auto const& path : platform_paths)
65
        for (auto const& path : platform_paths)
49
48
        {
66
            select_libraries_for_path(path, module_selector, *shared_library_prober_report);
42
49
            // This is sub-optimal. We shouldn't need to have all drivers
43
50
            // loaded simultaneously, but we do for now due to this API:
44
51
            auto modules = mir::libraries_for_path(path,
45
52
                                               *shared_library_prober_report);
46
53
            for (auto const& module : modules)
47
54
                 platform_modules.push_back(module);
48
55
        }
50
56
    }
67
    }
51
57
68
52
58
    for (auto& module : platform_modules)
69
    for (auto& module : platform_modules)
53
59
    {
70
    {
67
60
        try
71
        auto factory = module->load_function<CreateClientPlatform>("create_client_platform", CLIENT_PLATFORM_VERSION);
68
61
        {
72
        return factory(context);
56
62
            auto probe = module->load_function<mir::client::ClientPlatformProbe>("is_appropriate_module", CLIENT_PLATFORM_VERSION);
57
63
            if (probe(context))
58
64
            {
59
65
                auto factory = module->load_function<mir::client::CreateClientPlatform>("create_client_platform", CLIENT_PLATFORM_VERSION);
60
66
                return factory(context);
61
67
            }
62
68
        }
63
69
        catch(std::runtime_error const&)
64
70
        {
65
71
            // We were handed a SharedLibrary that's not a client platform module?
66
72
        }
69
73
    }
73
    }
70
74
71
74
    BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate client platform module found"});
75
    BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate client platform module found"});
72
75
}
76
}
73
76
77
74
=== modified file 'src/common/sharedlibrary/CMakeLists.txt'
75
--- src/common/sharedlibrary/CMakeLists.txt	2016-01-20 23:59:18 +0000
76
+++ src/common/sharedlibrary/CMakeLists.txt	2016-01-29 12:17:29 +0000
77
@@ -17,7 +17,7 @@
78
17
add_library(mirsharedsharedlibrary OBJECT
17
add_library(mirsharedsharedlibrary OBJECT
79
18
  module_deleter.cpp
18
  module_deleter.cpp
80
19
  shared_library.cpp
19
  shared_library.cpp
82
20
  shared_library_prober.cpp
20
  shared_library_prober.cpp ${PROJECT_SOURCE_DIR}/src/include/common/mir/shared_library_prober.h
83
21
)
21
)
84
22
22
85
23
list(APPEND MIR_COMMON_SOURCES
23
list(APPEND MIR_COMMON_SOURCES
86
24
24
87
=== modified file 'src/common/sharedlibrary/shared_library_prober.cpp'
88
--- src/common/sharedlibrary/shared_library_prober.cpp	2016-01-29 08:18:22 +0000
89
+++ src/common/sharedlibrary/shared_library_prober.cpp	2016-01-29 12:17:29 +0000
90
@@ -63,8 +63,10 @@
91
63
}
63
}
92
64
}
64
}
93
65
65
96
66
std::vector<std::shared_ptr<mir::SharedLibrary>>
66
void mir::select_libraries_for_path(
97
67
mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report)
67
    std::string const& path,
98
68
    std::function<Selection(std::shared_ptr<mir::SharedLibrary> const&)> const& selector,
99
69
    mir::SharedLibraryProberReport& report)
100
68
{
70
{
101
69
    report.probing_path(path);
71
    report.probing_path(path);
102
70
    // We use the error_code overload because we want to throw a std::system_error
72
    // We use the error_code overload because we want to throw a std::system_error
103
@@ -87,20 +89,33 @@
104
87
89
105
88
    std::sort(libraries.begin(), libraries.end(), &greater_soname_version);
90
    std::sort(libraries.begin(), libraries.end(), &greater_soname_version);
106
89
91
107
90
    std::vector<std::shared_ptr<mir::SharedLibrary>> result;
108
91
109
92
    for(auto& lib : libraries)
92
    for(auto& lib : libraries)
110
93
    {
93
    {
111
94
        try
94
        try
112
95
        {
95
        {
113
96
            report.loading_library(lib);
96
            report.loading_library(lib);
115
97
            result.emplace_back(std::make_shared<mir::SharedLibrary>(lib.string()));
97
            auto const shared_lib = std::make_shared<mir::SharedLibrary>(lib.string());
116
98
117
99
            if (selector(shared_lib) == Selection::quit)
118
100
                return;
119
98
        }
101
        }
120
99
        catch (std::runtime_error const& err)
102
        catch (std::runtime_error const& err)
121
100
        {
103
        {
122
101
            report.loading_failed(lib, err);
104
            report.loading_failed(lib, err);
123
102
        }
105
        }
124
103
    }
106
    }
125
107
}
126
108
127
109
std::vector<std::shared_ptr<mir::SharedLibrary>>
128
110
mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report)
129
111
{
130
112
    std::vector<std::shared_ptr<mir::SharedLibrary>> result;
131
113
132
114
    select_libraries_for_path(
133
115
        path,
134
116
        [&](std::shared_ptr<mir::SharedLibrary> const& shared_lib)
135
117
            { result.push_back(shared_lib); return Selection::persist; },
136
118
        report);
137
104
119
138
105
    return result;
120
    return result;
139
106
}
121
}
140
107
122
141
=== modified file 'src/common/symbols.map'
142
--- src/common/symbols.map	2016-01-29 12:17:29 +0000
143
+++ src/common/symbols.map	2016-01-29 12:17:29 +0000
144
@@ -211,3 +211,10 @@
145
211
      mir::detail::libname_impl*;
211
      mir::detail::libname_impl*;
146
212
    };
212
    };
147
213
} MIR_COMMON_5.1;
213
} MIR_COMMON_5.1;
148
214
149
215
MIR_COMMON_unreleased { # New functions in Mir 0.20
150
216
  global:
151
217
    extern "C++" {
152
218
      mir::select_libraries_for_path*;
153
219
    };
154
220
} MIR_COMMON_5v19;
155
214
\ No newline at end of file
221
\ No newline at end of file
156
215
222
157
=== modified file 'src/include/common/mir/shared_library_prober.h'
158
--- src/include/common/mir/shared_library_prober.h	2015-02-22 07:46:25 +0000
159
+++ src/include/common/mir/shared_library_prober.h	2016-01-29 12:17:29 +0000
160
@@ -30,6 +30,14 @@
161
30
class SharedLibrary;
30
class SharedLibrary;
162
31
31
163
32
std::vector<std::shared_ptr<SharedLibrary>> libraries_for_path(std::string const& path, SharedLibraryProberReport& report);
32
std::vector<std::shared_ptr<SharedLibrary>> libraries_for_path(std::string const& path, SharedLibraryProberReport& report);
164
33
165
34
// The selector can tell select_libraries_for_path() to persist or quit after each library
166
35
enum class Selection { persist, quit };
167
36
168
37
void select_libraries_for_path(
169
38
    std::string const& path,
170
39
    std::function<Selection(std::shared_ptr<SharedLibrary> const&)> const& selector,
171
40
    SharedLibraryProberReport& report);
172
33
}
41
}
173
34
42
174
35
43
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-02
Daniel van Vugt		2016-01-29	Approve on 2016-02-02
Cemil Azizoglu (community)			Approve on 2016-02-01
Alexandros Frantzis (community)			Approve on 2016-02-01
Alberto Aguirre (community)			Approve on 2016-02-01
Mir CI Bot	continuous-integration		Approve on 2016-01-29
Review via email: mp+284439@code.launchpad.net
1	=== modified file 'src/client/probing_client_platform_factory.cpp'
2	--- src/client/probing_client_platform_factory.cpp 2016-01-29 08:18:22 +0000
3	+++ src/client/probing_client_platform_factory.cpp 2016-01-29 12:17:29 +0000
4	@@ -31,6 +31,25 @@
5	31	// than it takes to choose the right one. So this list is local:	31	// than it takes to choose the right one. So this list is local:
6	32	std::vector<std::shared_ptr<mir::SharedLibrary>> platform_modules;	32	std::vector<std::shared_ptr<mir::SharedLibrary>> platform_modules;
7	33		33
8			34	auto const module_selector = [context, &platform_modules](std::shared_ptr<mir::SharedLibrary> const& module)
9			35	{
10			36	try
11			37	{
12			38	auto probe = module->load_function<ClientPlatformProbe>("is_appropriate_module", CLIENT_PLATFORM_VERSION);
13			39	if (probe(context))
14			40	{
15			41	platform_modules.push_back(module);
16			42	return Selection::quit;
17			43	}
18			44	}
19			45	catch (std::runtime_error const&)
20			46	{
21			47	// Assume we were handed a SharedLibrary that's not a client platform module of the correct vintage.
22			48	}
23			49
24			50	return Selection::persist;
25			51	};
26			52
27	34	if (!platform_overrides.empty())	53	if (!platform_overrides.empty())
28	35	{	54	{
29	36	// Even forcing a choice, platform is only loaded on demand. It's good	55	// Even forcing a choice, platform is only loaded on demand. It's good
30	@@ -39,37 +58,19 @@
31	39	// if you really wanted to.	58	// if you really wanted to.
32	40		59
33	41	for (auto const& platform : platform_overrides)	60	for (auto const& platform : platform_overrides)
36	42	platform_modules.push_back(	61	module_selector(std::make_shared<mir::SharedLibrary>(platform));
35	43	std::make_shared<mir::SharedLibrary>(platform));
37	44	}	62	}
38	45	else	63	else
39	46	{	64	{
40	47	for (auto const& path : platform_paths)	65	for (auto const& path : platform_paths)
49	48	{	66	select_libraries_for_path(path, module_selector, *shared_library_prober_report);
42	49	// This is sub-optimal. We shouldn't need to have all drivers
43	50	// loaded simultaneously, but we do for now due to this API:
44	51	auto modules = mir::libraries_for_path(path,
45	52	*shared_library_prober_report);
46	53	for (auto const& module : modules)
47	54	platform_modules.push_back(module);
48	55	}
50	56	}	67	}
51	57		68
52	58	for (auto& module : platform_modules)	69	for (auto& module : platform_modules)
53	59	{	70	{
67	60	try	71	auto factory = module->load_function<CreateClientPlatform>("create_client_platform", CLIENT_PLATFORM_VERSION);
68	61	{	72	return factory(context);
56	62	auto probe = module->load_function<mir::client::ClientPlatformProbe>("is_appropriate_module", CLIENT_PLATFORM_VERSION);
57	63	if (probe(context))
58	64	{
59	65	auto factory = module->load_function<mir::client::CreateClientPlatform>("create_client_platform", CLIENT_PLATFORM_VERSION);
60	66	return factory(context);
61	67	}
62	68	}
63	69	catch(std::runtime_error const&)
64	70	{
65	71	// We were handed a SharedLibrary that's not a client platform module?
66	72	}
69	73	}	73	}
70			74
71	74	BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate client platform module found"});	75	BOOST_THROW_EXCEPTION(std::runtime_error{"No appropriate client platform module found"});
72	75	}	76	}
73	76		77
74	=== modified file 'src/common/sharedlibrary/CMakeLists.txt'
75	--- src/common/sharedlibrary/CMakeLists.txt 2016-01-20 23:59:18 +0000
76	+++ src/common/sharedlibrary/CMakeLists.txt 2016-01-29 12:17:29 +0000
77	@@ -17,7 +17,7 @@
78	17	add_library(mirsharedsharedlibrary OBJECT	17	add_library(mirsharedsharedlibrary OBJECT
79	18	module_deleter.cpp	18	module_deleter.cpp
80	19	shared_library.cpp	19	shared_library.cpp
82	20	shared_library_prober.cpp	20	shared_library_prober.cpp ${PROJECT_SOURCE_DIR}/src/include/common/mir/shared_library_prober.h
83	21	)	21	)
84	22		22
85	23	list(APPEND MIR_COMMON_SOURCES	23	list(APPEND MIR_COMMON_SOURCES
86	24		24
87	=== modified file 'src/common/sharedlibrary/shared_library_prober.cpp'
88	--- src/common/sharedlibrary/shared_library_prober.cpp 2016-01-29 08:18:22 +0000
89	+++ src/common/sharedlibrary/shared_library_prober.cpp 2016-01-29 12:17:29 +0000
90	@@ -63,8 +63,10 @@
91	63	}	63	}
92	64	}	64	}
93	65		65
96	66	std::vector<std::shared_ptr<mir::SharedLibrary>>	66	void mir::select_libraries_for_path(
97	67	mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report)	67	std::string const& path,
98			68	std::function<Selection(std::shared_ptr<mir::SharedLibrary> const&)> const& selector,
99			69	mir::SharedLibraryProberReport& report)
100	68	{	70	{
101	69	report.probing_path(path);	71	report.probing_path(path);
102	70	// We use the error_code overload because we want to throw a std::system_error	72	// We use the error_code overload because we want to throw a std::system_error
103	@@ -87,20 +89,33 @@
104	87		89
105	88	std::sort(libraries.begin(), libraries.end(), &greater_soname_version);	90	std::sort(libraries.begin(), libraries.end(), &greater_soname_version);
106	89		91
107	90	std::vector<std::shared_ptr<mir::SharedLibrary>> result;
108	91
109	92	for(auto& lib : libraries)	92	for(auto& lib : libraries)
110	93	{	93	{
111	94	try	94	try
112	95	{	95	{
113	96	report.loading_library(lib);	96	report.loading_library(lib);
115	97	result.emplace_back(std::make_shared<mir::SharedLibrary>(lib.string()));	97	auto const shared_lib = std::make_shared<mir::SharedLibrary>(lib.string());
116			98
117			99	if (selector(shared_lib) == Selection::quit)
118			100	return;
119	98	}	101	}
120	99	catch (std::runtime_error const& err)	102	catch (std::runtime_error const& err)
121	100	{	103	{
122	101	report.loading_failed(lib, err);	104	report.loading_failed(lib, err);
123	102	}	105	}
124	103	}	106	}
125			107	}
126			108
127			109	std::vector<std::shared_ptr<mir::SharedLibrary>>
128			110	mir::libraries_for_path(std::string const& path, mir::SharedLibraryProberReport& report)
129			111	{
130			112	std::vector<std::shared_ptr<mir::SharedLibrary>> result;
131			113
132			114	select_libraries_for_path(
133			115	path,
134			116	[&](std::shared_ptr<mir::SharedLibrary> const& shared_lib)
135			117	{ result.push_back(shared_lib); return Selection::persist; },
136			118	report);
137	104		119
138	105	return result;	120	return result;
139	106	}	121	}
140	107		122
141	=== modified file 'src/common/symbols.map'
142	--- src/common/symbols.map 2016-01-29 12:17:29 +0000
143	+++ src/common/symbols.map 2016-01-29 12:17:29 +0000
144	@@ -211,3 +211,10 @@
145	211	mir::detail::libname_impl*;	211	mir::detail::libname_impl*;
146	212	};	212	};
147	213	} MIR_COMMON_5.1;	213	} MIR_COMMON_5.1;
148			214
149			215	MIR_COMMON_unreleased { # New functions in Mir 0.20
150			216	global:
151			217	extern "C++" {
152			218	mir::select_libraries_for_path*;
153			219	};
154			220	} MIR_COMMON_5v19;
155	214	\ No newline at end of file	221	\ No newline at end of file
156	215		222
157	=== modified file 'src/include/common/mir/shared_library_prober.h'
158	--- src/include/common/mir/shared_library_prober.h 2015-02-22 07:46:25 +0000
159	+++ src/include/common/mir/shared_library_prober.h 2016-01-29 12:17:29 +0000
160	@@ -30,6 +30,14 @@
161	30	class SharedLibrary;	30	class SharedLibrary;
162	31		31
163	32	std::vector<std::shared_ptr<SharedLibrary>> libraries_for_path(std::string const& path, SharedLibraryProberReport& report);	32	std::vector<std::shared_ptr<SharedLibrary>> libraries_for_path(std::string const& path, SharedLibraryProberReport& report);
164			33
165			34	// The selector can tell select_libraries_for_path() to persist or quit after each library
166			35	enum class Selection { persist, quit };
167			36
168			37	void select_libraries_for_path(
169			38	std::string const& path,
170			39	std::function<Selection(std::shared_ptr<SharedLibrary> const&)> const& selector,
171			40	SharedLibraryProberReport& report);
172	33	}	41	}
173	34		42
174	35		43