1
=== modified file 'examples/CMakeLists.txt'
2
--- examples/CMakeLists.txt	2014-06-11 16:11:32 +0000
3
+++ examples/CMakeLists.txt	2014-07-21 16:56:41 +0000
4
@@ -50,6 +50,9 @@
5
50
  ${CMAKE_THREAD_LIBS_INIT}
50
  ${CMAKE_THREAD_LIBS_INIT}
6
51
)
51
)
7
52
52
8
53
add_executable(mir_test_client_release_at_exit release_at_exit.c)
9
54
target_link_libraries(mir_test_client_release_at_exit mirclient)
10
55
11
53
add_executable(mir_demo_client_multiwin multiwin.c)
56
add_executable(mir_demo_client_multiwin multiwin.c)
12
54
target_link_libraries(mir_demo_client_multiwin mirclient)
57
target_link_libraries(mir_demo_client_multiwin mirclient)
13
55
58
14
56
59
15
=== added file 'examples/release_at_exit.c'
16
--- examples/release_at_exit.c	1970-01-01 00:00:00 +0000
17
+++ examples/release_at_exit.c	2014-07-21 16:56:41 +0000
18
@@ -0,0 +1,109 @@
19
1
/*
20
2
 * Copyright © 2012-2014 Canonical Ltd.
21
3
 *
22
4
 * This program is free software: you can redistribute it and/or modify
23
5
 * it under the terms of the GNU General Public License version 3 as
24
6
 * published by the Free Software Foundation.
25
7
 *
26
8
 * This program is distributed in the hope that it will be useful,
27
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
28
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
29
11
 * GNU General Public License for more details.
30
12
 *
31
13
 * You should have received a copy of the GNU General Public License
32
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
33
15
 *
34
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
35
17
 */
36
18
37
19
#include "mir_toolkit/mir_client_library.h"
38
20
39
21
#include <assert.h>
40
22
#include <string.h>
41
23
#include <stdio.h>
42
24
#include <stdlib.h>
43
25
#include <getopt.h>
44
26
45
27
static MirConnection *connection = 0;
46
28
static MirSurface *surface = 0;
47
29
48
30
static void connection_callback(MirConnection *new_connection, void *context)
49
31
{
50
32
    (void)context;
51
33
    connection = new_connection;
52
34
}
53
35
54
36
static void surface_create_callback(MirSurface *new_surface, void *context)
55
37
{
56
38
    (void)context;
57
39
    surface = new_surface;
58
40
}
59
41
60
42
static void surface_release_callback(MirSurface *old_surface, void *context)
61
43
{
62
44
    (void)old_surface;
63
45
    (void)context;
64
46
    surface = 0;
65
47
}
66
48
67
49
static void close_connection()
68
50
{
69
51
    if (connection)
70
52
    {
71
53
        mir_connection_release(connection);
72
54
    }
73
55
}
74
56
75
57
76
58
void demo_client(const char* server)
77
59
{
78
60
    atexit(&close_connection);
79
61
80
62
    mir_wait_for(mir_connect(server, __FILE__, connection_callback, NULL));
81
63
    assert(mir_connection_is_valid(connection));
82
64
83
65
    MirPixelFormat pixel_format;
84
66
    unsigned int valid_formats;
85
67
    mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats);
86
68
    MirSurfaceParameters const request_params =
87
69
        {NULL, 640, 480, pixel_format,
88
70
         mir_buffer_usage_hardware, mir_display_output_id_invalid};
89
71
90
72
    mir_wait_for(mir_connection_create_surface(connection, &request_params, surface_create_callback, NULL));
91
73
    mir_wait_for(mir_surface_release(surface, surface_release_callback, NULL));
92
74
}
93
75
94
76
int main(int argc, char* argv[])
95
77
{
96
78
    // Some variables for holding command line options
97
79
    char const *server = NULL;
98
80
99
81
    // Parse the command line
100
82
    {
101
83
        int arg;
102
84
        opterr = 0;
103
85
        while ((arg = getopt (argc, argv, "hm:")) != -1)
104
86
        {
105
87
            switch (arg)
106
88
            {
107
89
            case 'm':
108
90
                server = optarg;
109
91
                break;
110
92
111
93
            case '?':
112
94
            case 'h':
113
95
            default:
114
96
                puts(argv[0]);
115
97
                puts("Cutdown version of mir_demo_client_basic to show that");
116
98
                puts("clients can release the connection after main() exits.");
117
99
                puts("Usage:");
118
100
                puts("    -m <Mir server socket>");
119
101
                puts("    -h: this help text");
120
102
                return -1;
121
103
            }
122
104
        }
123
105
    }
124
106
125
107
    demo_client(server);
126
108
    return 0;
127
109
}
128
0
110
129
=== modified file 'src/client/android/android_native_display_container.cpp'
130
--- src/client/android/android_native_display_container.cpp	2013-04-24 05:22:20 +0000
131
+++ src/client/android/android_native_display_container.cpp	2014-07-21 16:56:41 +0000
132
@@ -20,13 +20,35 @@
133
20
20
134
21
#include "mir_toolkit/mir_client_library.h"
21
#include "mir_toolkit/mir_client_library.h"
135
22
22
136
23
#include <mutex>
137
24
138
23
namespace mcl = mir::client;
25
namespace mcl = mir::client;
139
24
namespace mcla = mcl::android;
26
namespace mcla = mcl::android;
140
25
27
141
28
namespace
142
29
{
143
30
// default_display_container needs to live until the library is unloaded
144
31
std::mutex default_display_container_mutex;
145
32
mcla::AndroidNativeDisplayContainer* default_display_container{nullptr};
146
33
147
34
extern "C" int __attribute__((destructor)) destroy()
148
35
{
149
36
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
150
37
151
38
    delete default_display_container;
152
39
153
40
    return 0;
154
41
}
155
42
}
156
43
157
26
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
44
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
158
27
{
45
{
161
28
    static mcla::AndroidNativeDisplayContainer default_display_container;
46
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
162
29
    return default_display_container;
47
163
48
    if (!default_display_container)
164
49
        default_display_container = new mcla::AndroidNativeDisplayContainer;
165
50
166
51
    return *default_display_container;
167
30
}
52
}
168
31
53
169
32
mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()
54
mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()
170
33
55
171
=== modified file 'src/client/connection_configuration.h'
172
--- src/client/connection_configuration.h	2014-05-29 13:21:08 +0000
173
+++ src/client/connection_configuration.h	2014-07-21 16:56:41 +0000
174
@@ -39,8 +39,11 @@
175
39
class Logger;
39
class Logger;
176
40
}
40
}
177
41
41
178
42
class SharedLibrary;
179
43
180
42
namespace client
44
namespace client
181
43
{
45
{
182
46
std::shared_ptr<SharedLibrary>& libraries_cache(std::string const& lib_name);
183
44
47
184
45
class ConnectionSurfaceMap;
48
class ConnectionSurfaceMap;
185
46
class Logger;
49
class Logger;
186
@@ -70,7 +73,6 @@
187
70
    ConnectionConfiguration(ConnectionConfiguration const&) = delete;
73
    ConnectionConfiguration(ConnectionConfiguration const&) = delete;
188
71
    ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;
74
    ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;
189
72
};
75
};
190
73
191
74
}
76
}
192
75
}
77
}
193
76
78
194
77
79
195
=== modified file 'src/client/default_connection_configuration.cpp'
196
--- src/client/default_connection_configuration.cpp	2014-05-29 13:21:08 +0000
197
+++ src/client/default_connection_configuration.cpp	2014-07-21 16:56:41 +0000
198
@@ -45,10 +45,8 @@
199
45
45
200
46
mir::SharedLibrary const* load_library(std::string const& libname)
46
mir::SharedLibrary const* load_library(std::string const& libname)
201
47
{
47
{
202
48
    // There's no point in loading twice, and it isn't safe to unload...
203
49
    static std::map<std::string, std::shared_ptr<mir::SharedLibrary>> libraries_cache;
204
50
48
206
51
    if (auto& ptr = libraries_cache[libname])
49
    if (auto& ptr = mcl::libraries_cache(libname))
207
52
    {
50
    {
208
53
        return ptr.get();
51
        return ptr.get();
209
54
    }
52
    }
210
55
53
211
=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
212
--- src/client/mesa/mesa_native_display_container.cpp	2014-03-06 06:05:17 +0000
213
+++ src/client/mesa/mesa_native_display_container.cpp	2014-07-21 16:56:41 +0000
214
@@ -46,12 +46,30 @@
215
46
}
46
}
216
47
47
217
48
}
48
}
219
49
}
49
220
50
// default_display_container needs to live until the library is unloaded
221
51
std::mutex default_display_container_mutex;
222
52
mclm::MesaNativeDisplayContainer* default_display_container{nullptr};
223
53
224
54
extern "C" int __attribute__((destructor)) destroy()
225
55
{
226
56
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
227
57
228
58
    delete default_display_container;
229
59
230
60
    return 0;
231
61
}
232
62
}
233
63
234
50
64
235
51
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
65
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
236
52
{
66
{
239
53
    static mclm::MesaNativeDisplayContainer default_display_container;
67
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
240
54
    return default_display_container;
68
241
69
    if (!default_display_container)
242
70
        default_display_container = new mclm::MesaNativeDisplayContainer;
243
71
244
72
    return *default_display_container;
245
55
}
73
}
246
56
74
247
57
mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
75
mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
248
58
76
249
=== modified file 'src/client/mir_connection.cpp'
250
--- src/client/mir_connection.cpp	2014-06-16 14:47:14 +0000
251
+++ src/client/mir_connection.cpp	2014-07-21 16:56:41 +0000
252
@@ -63,11 +63,48 @@
253
63
    MirDisplayConfiguration* const config;
63
    MirDisplayConfiguration* const config;
254
64
};
64
};
255
65
65
256
66
using LibrariesCache = std::map<std::string, std::shared_ptr<mir::SharedLibrary>>;
257
67
258
66
std::mutex connection_guard;
68
std::mutex connection_guard;
260
67
std::unordered_set<MirConnection*> valid_connections;
69
MirConnection* valid_connections{nullptr};
261
70
// There's no point in loading twice, and it isn't safe to
262
71
// unload while there are valid connections
263
72
std::map<std::string, std::shared_ptr<mir::SharedLibrary>>* libraries_cache_ptr{nullptr};
264
73
}
265
74
266
75
std::shared_ptr<mir::SharedLibrary>& mcl::libraries_cache(std::string const& libname)
267
76
{
268
77
    std::lock_guard<std::mutex> lock(connection_guard);
269
78
270
79
    if (!libraries_cache_ptr)
271
80
        libraries_cache_ptr = new LibrariesCache;
272
81
273
82
    return (*libraries_cache_ptr)[libname];
274
83
}
275
84
276
85
MirConnection::Deregisterer::~Deregisterer()
277
86
{
278
87
    std::lock_guard<std::mutex> lock(connection_guard);
279
88
280
89
    for (auto current = &valid_connections; *current; current = &(*current)->next_valid)
281
90
    {
282
91
        if (self == *current)
283
92
        {
284
93
            *current = self->next_valid;
285
94
            break;
286
95
        }
287
96
    }
288
97
289
98
    // When the last valid connection goes we can clear the libraries cache
290
99
    if (!valid_connections)
291
100
    {
292
101
        delete libraries_cache_ptr;
293
102
        libraries_cache_ptr = nullptr;
294
103
    }
295
68
}
104
}
296
69
105
297
70
MirConnection::MirConnection(std::string const& error_message) :
106
MirConnection::MirConnection(std::string const& error_message) :
298
107
    deregisterer{this},
299
71
    channel(),
108
    channel(),
300
72
    server(0),
109
    server(0),
301
73
    error_message(error_message)
110
    error_message(error_message)
302
@@ -76,6 +113,7 @@
303
76
113
304
77
MirConnection::MirConnection(
114
MirConnection::MirConnection(
305
78
    mir::client::ConnectionConfiguration& conf) :
115
    mir::client::ConnectionConfiguration& conf) :
306
116
        deregisterer{this},
307
79
        channel(conf.the_rpc_channel()),
117
        channel(conf.the_rpc_channel()),
308
80
        server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
118
        server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
309
81
        logger(conf.the_logger()),
119
        logger(conf.the_logger()),
310
@@ -89,7 +127,8 @@
311
89
    connect_result.set_error("connect not called");
127
    connect_result.set_error("connect not called");
312
90
    {
128
    {
313
91
        std::lock_guard<std::mutex> lock(connection_guard);
129
        std::lock_guard<std::mutex> lock(connection_guard);
315
92
        valid_connections.insert(this);
130
        next_valid = valid_connections;
316
131
        valid_connections = this;
317
93
    }
132
    }
318
94
}
133
}
319
95
134
320
@@ -99,11 +138,6 @@
321
99
    // But, if after 500ms we don't get a call, assume it won't happen.
138
    // But, if after 500ms we don't get a call, assume it won't happen.
322
100
    connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));
139
    connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));
323
101
140
324
102
    {
325
103
        std::lock_guard<std::mutex> lock(connection_guard);
326
104
        valid_connections.erase(this);
327
105
    }
328
106
329
107
    std::lock_guard<decltype(mutex)> lock(mutex);
141
    std::lock_guard<decltype(mutex)> lock(mutex);
330
108
    if (connect_result.has_platform())
142
    if (connect_result.has_platform())
331
109
    {
143
    {
332
@@ -317,13 +351,18 @@
333
317
bool MirConnection::is_valid(MirConnection *connection)
351
bool MirConnection::is_valid(MirConnection *connection)
334
318
{
352
{
335
319
    {
353
    {
339
320
        std::lock_guard<std::mutex> lock(connection_guard);
354
        std::unique_lock<std::mutex> lock(connection_guard);
340
321
        if (valid_connections.count(connection) == 0)
355
        for (auto current = valid_connections; current; current = current->next_valid)
341
322
           return false;
356
        {
342
357
            if (connection == current)
343
358
            {
344
359
                lock.unlock();
345
360
                std::lock_guard<decltype(connection->mutex)> lock(connection->mutex);
346
361
                return !connection->connect_result.has_error();
347
362
            }
348
363
        }
349
323
    }
364
    }
353
324
365
    return false;
351
325
    std::lock_guard<decltype(connection->mutex)> lock(connection->mutex);
352
326
    return !connection->connect_result.has_error();
354
327
}
366
}
355
328
367
356
329
void MirConnection::populate(MirPlatformPackage& platform_package)
368
void MirConnection::populate(MirPlatformPackage& platform_package)
357
330
369
358
=== modified file 'src/client/mir_connection.h'
359
--- src/client/mir_connection.h	2014-06-11 16:11:32 +0000
360
+++ src/client/mir_connection.h	2014-07-21 16:56:41 +0000
361
@@ -134,6 +134,10 @@
362
134
    mir::protobuf::DisplayServer& display_server();
134
    mir::protobuf::DisplayServer& display_server();
363
135
135
364
136
private:
136
private:
365
137
    // MUST be first data member so it is destroyed last.
366
138
    struct Deregisterer
367
139
    { MirConnection* const self; ~Deregisterer(); } deregisterer;
368
140
369
137
    std::mutex mutex; // Protects all members of *this (except release_wait_handles)
141
    std::mutex mutex; // Protects all members of *this (except release_wait_handles)
370
138
142
371
139
    std::shared_ptr<google::protobuf::RpcChannel> const channel;
143
    std::shared_ptr<google::protobuf::RpcChannel> const channel;
372
@@ -174,6 +178,8 @@
373
174
178
374
175
    struct SurfaceRelease;
179
    struct SurfaceRelease;
375
176
180
376
181
    MirConnection* next_valid{nullptr};
377
182
378
177
    void set_error_message(std::string const& error);
183
    void set_error_message(std::string const& error);
379
178
    void done_disconnect();
184
    void done_disconnect();
380
179
    void connected(mir_connected_callback callback, void * context);
185
    void connected(mir_connected_callback callback, void * context);
Reviewer	Review Type	Date Requested	Status
Alexandros Frantzis (community)		2014-07-17	Approve on 2014-07-22
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-22
Robert Carr (community)			Approve on 2014-07-21
Review via email: mp+227178@code.launchpad.net
1	=== modified file 'examples/CMakeLists.txt'
2	--- examples/CMakeLists.txt 2014-06-11 16:11:32 +0000
3	+++ examples/CMakeLists.txt 2014-07-21 16:56:41 +0000
4	@@ -50,6 +50,9 @@
5	50	${CMAKE_THREAD_LIBS_INIT}	50	${CMAKE_THREAD_LIBS_INIT}
6	51	)	51	)
7	52		52
8			53	add_executable(mir_test_client_release_at_exit release_at_exit.c)
9			54	target_link_libraries(mir_test_client_release_at_exit mirclient)
10			55
11	53	add_executable(mir_demo_client_multiwin multiwin.c)	56	add_executable(mir_demo_client_multiwin multiwin.c)
12	54	target_link_libraries(mir_demo_client_multiwin mirclient)	57	target_link_libraries(mir_demo_client_multiwin mirclient)
13	55		58
14	56		59
15	=== added file 'examples/release_at_exit.c'
16	--- examples/release_at_exit.c 1970-01-01 00:00:00 +0000
17	+++ examples/release_at_exit.c 2014-07-21 16:56:41 +0000
18	@@ -0,0 +1,109 @@
19			1	/*
20			2	* Copyright © 2012-2014 Canonical Ltd.
21			3	*
22			4	* This program is free software: you can redistribute it and/or modify
23			5	* it under the terms of the GNU General Public License version 3 as
24			6	* published by the Free Software Foundation.
25			7	*
26			8	* This program is distributed in the hope that it will be useful,
27			9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
28			10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29			11	* GNU General Public License for more details.
30			12	*
31			13	* You should have received a copy of the GNU General Public License
32			14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
33			15	*
34			16	* Authored by: Alan Griffiths <alan@octopull.co.uk>
35			17	*/
36			18
37			19	#include "mir_toolkit/mir_client_library.h"
38			20
39			21	#include <assert.h>
40			22	#include <string.h>
41			23	#include <stdio.h>
42			24	#include <stdlib.h>
43			25	#include <getopt.h>
44			26
45			27	static MirConnection *connection = 0;
46			28	static MirSurface *surface = 0;
47			29
48			30	static void connection_callback(MirConnection new_connection, void context)
49			31	{
50			32	(void)context;
51			33	connection = new_connection;
52			34	}
53			35
54			36	static void surface_create_callback(MirSurface new_surface, void context)
55			37	{
56			38	(void)context;
57			39	surface = new_surface;
58			40	}
59			41
60			42	static void surface_release_callback(MirSurface old_surface, void context)
61			43	{
62			44	(void)old_surface;
63			45	(void)context;
64			46	surface = 0;
65			47	}
66			48
67			49	static void close_connection()
68			50	{
69			51	if (connection)
70			52	{
71			53	mir_connection_release(connection);
72			54	}
73			55	}
74			56
75			57
76			58	void demo_client(const char* server)
77			59	{
78			60	atexit(&close_connection);
79			61
80			62	mir_wait_for(mir_connect(server, __FILE__, connection_callback, NULL));
81			63	assert(mir_connection_is_valid(connection));
82			64
83			65	MirPixelFormat pixel_format;
84			66	unsigned int valid_formats;
85			67	mir_connection_get_available_surface_formats(connection, &pixel_format, 1, &valid_formats);
86			68	MirSurfaceParameters const request_params =
87			69	{NULL, 640, 480, pixel_format,
88			70	mir_buffer_usage_hardware, mir_display_output_id_invalid};
89			71
90			72	mir_wait_for(mir_connection_create_surface(connection, &request_params, surface_create_callback, NULL));
91			73	mir_wait_for(mir_surface_release(surface, surface_release_callback, NULL));
92			74	}
93			75
94			76	int main(int argc, char* argv[])
95			77	{
96			78	// Some variables for holding command line options
97			79	char const *server = NULL;
98			80
99			81	// Parse the command line
100			82	{
101			83	int arg;
102			84	opterr = 0;
103			85	while ((arg = getopt (argc, argv, "hm:")) != -1)
104			86	{
105			87	switch (arg)
106			88	{
107			89	case 'm':
108			90	server = optarg;
109			91	break;
110			92
111			93	case '?':
112			94	case 'h':
113			95	default:
114			96	puts(argv[0]);
115			97	puts("Cutdown version of mir_demo_client_basic to show that");
116			98	puts("clients can release the connection after main() exits.");
117			99	puts("Usage:");
118			100	puts(" -m <Mir server socket>");
119			101	puts(" -h: this help text");
120			102	return -1;
121			103	}
122			104	}
123			105	}
124			106
125			107	demo_client(server);
126			108	return 0;
127			109	}
128	0		110
129	=== modified file 'src/client/android/android_native_display_container.cpp'
130	--- src/client/android/android_native_display_container.cpp 2013-04-24 05:22:20 +0000
131	+++ src/client/android/android_native_display_container.cpp 2014-07-21 16:56:41 +0000
132	@@ -20,13 +20,35 @@
133	20		20
134	21	#include "mir_toolkit/mir_client_library.h"	21	#include "mir_toolkit/mir_client_library.h"
135	22		22
136			23	#include <mutex>
137			24
138	23	namespace mcl = mir::client;	25	namespace mcl = mir::client;
139	24	namespace mcla = mcl::android;	26	namespace mcla = mcl::android;
140	25		27
141			28	namespace
142			29	{
143			30	// default_display_container needs to live until the library is unloaded
144			31	std::mutex default_display_container_mutex;
145			32	mcla::AndroidNativeDisplayContainer* default_display_container{nullptr};
146			33
147			34	extern "C" int __attribute__((destructor)) destroy()
148			35	{
149			36	std::lock_guard<std::mutex> lock(default_display_container_mutex);
150			37
151			38	delete default_display_container;
152			39
153			40	return 0;
154			41	}
155			42	}
156			43
157	26	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()	44	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
158	27	{	45	{
161	28	static mcla::AndroidNativeDisplayContainer default_display_container;	46	std::lock_guard<std::mutex> lock(default_display_container_mutex);
162	29	return default_display_container;	47
163			48	if (!default_display_container)
164			49	default_display_container = new mcla::AndroidNativeDisplayContainer;
165			50
166			51	return *default_display_container;
167	30	}	52	}
168	31		53
169	32	mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()	54	mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()
170	33		55
171	=== modified file 'src/client/connection_configuration.h'
172	--- src/client/connection_configuration.h 2014-05-29 13:21:08 +0000
173	+++ src/client/connection_configuration.h 2014-07-21 16:56:41 +0000
174	@@ -39,8 +39,11 @@
175	39	class Logger;	39	class Logger;
176	40	}	40	}
177	41		41
178			42	class SharedLibrary;
179			43
180	42	namespace client	44	namespace client
181	43	{	45	{
182			46	std::shared_ptr<SharedLibrary>& libraries_cache(std::string const& lib_name);
183	44		47
184	45	class ConnectionSurfaceMap;	48	class ConnectionSurfaceMap;
185	46	class Logger;	49	class Logger;
186	@@ -70,7 +73,6 @@
187	70	ConnectionConfiguration(ConnectionConfiguration const&) = delete;	73	ConnectionConfiguration(ConnectionConfiguration const&) = delete;
188	71	ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;	74	ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;
189	72	};	75	};
190	73
191	74	}	76	}
192	75	}	77	}
193	76		78
194	77		79
195	=== modified file 'src/client/default_connection_configuration.cpp'
196	--- src/client/default_connection_configuration.cpp 2014-05-29 13:21:08 +0000
197	+++ src/client/default_connection_configuration.cpp 2014-07-21 16:56:41 +0000
198	@@ -45,10 +45,8 @@
199	45		45
200	46	mir::SharedLibrary const* load_library(std::string const& libname)	46	mir::SharedLibrary const* load_library(std::string const& libname)
201	47	{	47	{
202	48	// There's no point in loading twice, and it isn't safe to unload...
203	49	static std::map<std::string, std::shared_ptr<mir::SharedLibrary>> libraries_cache;
204	50		48
206	51	if (auto& ptr = libraries_cache[libname])	49	if (auto& ptr = mcl::libraries_cache(libname))
207	52	{	50	{
208	53	return ptr.get();	51	return ptr.get();
209	54	}	52	}
210	55		53
211	=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
212	--- src/client/mesa/mesa_native_display_container.cpp 2014-03-06 06:05:17 +0000
213	+++ src/client/mesa/mesa_native_display_container.cpp 2014-07-21 16:56:41 +0000
214	@@ -46,12 +46,30 @@
215	46	}	46	}
216	47		47
217	48	}	48	}
219	49	}	49
220			50	// default_display_container needs to live until the library is unloaded
221			51	std::mutex default_display_container_mutex;
222			52	mclm::MesaNativeDisplayContainer* default_display_container{nullptr};
223			53
224			54	extern "C" int __attribute__((destructor)) destroy()
225			55	{
226			56	std::lock_guard<std::mutex> lock(default_display_container_mutex);
227			57
228			58	delete default_display_container;
229			59
230			60	return 0;
231			61	}
232			62	}
233			63
234	50		64
235	51	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()	65	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
236	52	{	66	{
239	53	static mclm::MesaNativeDisplayContainer default_display_container;	67	std::lock_guard<std::mutex> lock(default_display_container_mutex);
240	54	return default_display_container;	68
241			69	if (!default_display_container)
242			70	default_display_container = new mclm::MesaNativeDisplayContainer;
243			71
244			72	return *default_display_container;
245	55	}	73	}
246	56		74
247	57	mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()	75	mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
248	58		76
249	=== modified file 'src/client/mir_connection.cpp'
250	--- src/client/mir_connection.cpp 2014-06-16 14:47:14 +0000
251	+++ src/client/mir_connection.cpp 2014-07-21 16:56:41 +0000
252	@@ -63,11 +63,48 @@
253	63	MirDisplayConfiguration* const config;	63	MirDisplayConfiguration* const config;
254	64	};	64	};
255	65		65
256			66	using LibrariesCache = std::map<std::string, std::shared_ptr<mir::SharedLibrary>>;
257			67
258	66	std::mutex connection_guard;	68	std::mutex connection_guard;
260	67	std::unordered_set<MirConnection*> valid_connections;	69	MirConnection* valid_connections{nullptr};
261			70	// There's no point in loading twice, and it isn't safe to
262			71	// unload while there are valid connections
263			72	std::map<std::string, std::shared_ptr<mir::SharedLibrary>>* libraries_cache_ptr{nullptr};
264			73	}
265			74
266			75	std::shared_ptr<mir::SharedLibrary>& mcl::libraries_cache(std::string const& libname)
267			76	{
268			77	std::lock_guard<std::mutex> lock(connection_guard);
269			78
270			79	if (!libraries_cache_ptr)
271			80	libraries_cache_ptr = new LibrariesCache;
272			81
273			82	return (*libraries_cache_ptr)[libname];
274			83	}
275			84
276			85	MirConnection::Deregisterer::~Deregisterer()
277			86	{
278			87	std::lock_guard<std::mutex> lock(connection_guard);
279			88
280			89	for (auto current = &valid_connections; current; current = &(current)->next_valid)
281			90	{
282			91	if (self == *current)
283			92	{
284			93	*current = self->next_valid;
285			94	break;
286			95	}
287			96	}
288			97
289			98	// When the last valid connection goes we can clear the libraries cache
290			99	if (!valid_connections)
291			100	{
292			101	delete libraries_cache_ptr;
293			102	libraries_cache_ptr = nullptr;
294			103	}
295	68	}	104	}
296	69		105
297	70	MirConnection::MirConnection(std::string const& error_message) :	106	MirConnection::MirConnection(std::string const& error_message) :
298			107	deregisterer{this},
299	71	channel(),	108	channel(),
300	72	server(0),	109	server(0),
301	73	error_message(error_message)	110	error_message(error_message)
302	@@ -76,6 +113,7 @@
303	76		113
304	77	MirConnection::MirConnection(	114	MirConnection::MirConnection(
305	78	mir::client::ConnectionConfiguration& conf) :	115	mir::client::ConnectionConfiguration& conf) :
306			116	deregisterer{this},
307	79	channel(conf.the_rpc_channel()),	117	channel(conf.the_rpc_channel()),
308	80	server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),	118	server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
309	81	logger(conf.the_logger()),	119	logger(conf.the_logger()),
310	@@ -89,7 +127,8 @@
311	89	connect_result.set_error("connect not called");	127	connect_result.set_error("connect not called");
312	90	{	128	{
313	91	std::lock_guard<std::mutex> lock(connection_guard);	129	std::lock_guard<std::mutex> lock(connection_guard);
315	92	valid_connections.insert(this);	130	next_valid = valid_connections;
316			131	valid_connections = this;
317	93	}	132	}
318	94	}	133	}
319	95		134
320	@@ -99,11 +138,6 @@
321	99	// But, if after 500ms we don't get a call, assume it won't happen.	138	// But, if after 500ms we don't get a call, assume it won't happen.
322	100	connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));	139	connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));
323	101		140
324	102	{
325	103	std::lock_guard<std::mutex> lock(connection_guard);
326	104	valid_connections.erase(this);
327	105	}
328	106
329	107	std::lock_guard<decltype(mutex)> lock(mutex);	141	std::lock_guard<decltype(mutex)> lock(mutex);
330	108	if (connect_result.has_platform())	142	if (connect_result.has_platform())
331	109	{	143	{
332	@@ -317,13 +351,18 @@
333	317	bool MirConnection::is_valid(MirConnection *connection)	351	bool MirConnection::is_valid(MirConnection *connection)
334	318	{	352	{
335	319	{	353	{
339	320	std::lock_guard<std::mutex> lock(connection_guard);	354	std::unique_lock<std::mutex> lock(connection_guard);
340	321	if (valid_connections.count(connection) == 0)	355	for (auto current = valid_connections; current; current = current->next_valid)
341	322	return false;	356	{
342			357	if (connection == current)
343			358	{
344			359	lock.unlock();
345			360	std::lock_guard<decltype(connection->mutex)> lock(connection->mutex);
346			361	return !connection->connect_result.has_error();
347			362	}
348			363	}
349	323	}	364	}
353	324		365	return false;
351	325	std::lock_guard<decltype(connection->mutex)> lock(connection->mutex);
352	326	return !connection->connect_result.has_error();
354	327	}	366	}
355	328		367
356	329	void MirConnection::populate(MirPlatformPackage& platform_package)	368	void MirConnection::populate(MirPlatformPackage& platform_package)
357	330		369
358	=== modified file 'src/client/mir_connection.h'
359	--- src/client/mir_connection.h 2014-06-11 16:11:32 +0000
360	+++ src/client/mir_connection.h 2014-07-21 16:56:41 +0000
361	@@ -134,6 +134,10 @@
362	134	mir::protobuf::DisplayServer& display_server();	134	mir::protobuf::DisplayServer& display_server();
363	135		135
364	136	private:	136	private:
365			137	// MUST be first data member so it is destroyed last.
366			138	struct Deregisterer
367			139	{ MirConnection* const self; ~Deregisterer(); } deregisterer;
368			140
369	137	std::mutex mutex; // Protects all members of *this (except release_wait_handles)	141	std::mutex mutex; // Protects all members of *this (except release_wait_handles)
370	138		142
371	139	std::shared_ptr<google::protobuf::RpcChannel> const channel;	143	std::shared_ptr<google::protobuf::RpcChannel> const channel;
372	@@ -174,6 +178,8 @@
373	174		178
374	175	struct SurfaceRelease;	179	struct SurfaceRelease;
375	176		180
376			181	MirConnection* next_valid{nullptr};
377			182
378	177	void set_error_message(std::string const& error);	183	void set_error_message(std::string const& error);
379	178	void done_disconnect();	184	void done_disconnect();
380	179	void connected(mir_connected_callback callback, void * context);	185	void connected(mir_connected_callback callback, void * context);