1
=== modified file 'examples/basic.c'
2
--- examples/basic.c	2014-03-06 06:05:17 +0000
3
+++ examples/basic.c	2014-07-17 13:57:55 +0000
4
@@ -88,11 +88,25 @@
5
88
}
88
}
6
89
///\internal [Callback_tag]
89
///\internal [Callback_tag]
7
90
90
8
91
MirDemoState mcd = {0, 0};
9
92
10
93
static void close_connection()
11
94
{
12
95
    if (mcd.connection)
13
96
    {
14
97
        ///\internal [connection_release_tag]
15
98
        mir_connection_release(mcd.connection);
16
99
        puts("Connection released");
17
100
        ///\internal [connection_release_tag]
18
101
    }
19
102
}
20
103
21
91
void demo_client(const char* server, int buffer_swap_count)
104
void demo_client(const char* server, int buffer_swap_count)
22
92
{
105
{
23
93
    MirDemoState mcd;
24
94
    mcd.connection = 0;
106
    mcd.connection = 0;
25
95
    mcd.surface = 0;
107
    mcd.surface = 0;
26
108
    // We should always release our connection
27
109
    atexit(&close_connection);
28
96
110
29
97
    puts("Starting");
111
    puts("Starting");
30
98
112
31
@@ -182,12 +196,6 @@
32
182
    mir_wait_for(mir_surface_release(mcd.surface, surface_release_callback, &mcd));
196
    mir_wait_for(mir_surface_release(mcd.surface, surface_release_callback, &mcd));
33
183
    puts("Surface released");
197
    puts("Surface released");
34
184
    ///\internal [surface_release_tag]
198
    ///\internal [surface_release_tag]
35
185
36
186
    ///\internal [connection_release_tag]
37
187
    // We should release our connection
38
188
    mir_connection_release(mcd.connection);
39
189
    puts("Connection released");
40
190
    ///\internal [connection_release_tag]
41
191
}
199
}
42
192
200
43
193
// The main() function deals with parsing arguments and defaults
201
// The main() function deals with parsing arguments and defaults
44
194
202
45
=== modified file 'src/client/android/android_native_display_container.cpp'
46
--- src/client/android/android_native_display_container.cpp	2014-07-16 16:28:55 +0000
47
+++ src/client/android/android_native_display_container.cpp	2014-07-17 13:57:55 +0000
48
@@ -20,16 +20,35 @@
49
20
20
50
21
#include "mir_toolkit/mir_client_library.h"
21
#include "mir_toolkit/mir_client_library.h"
51
22
22
52
23
#include <mutex>
53
24
54
23
namespace mcl = mir::client;
25
namespace mcl = mir::client;
55
24
namespace mcla = mcl::android;
26
namespace mcla = mcl::android;
56
25
27
60
26
// TODO making this namespace scope extends its life slightly (and avoids a potential crash)
28
namespace
61
27
// TODO but we should manage it and ensure it is only released after the last connection dies
29
{
62
28
static mcla::AndroidNativeDisplayContainer default_display_container;
30
// default_display_container needs to live until the library is unloaded
63
31
std::mutex default_display_container_mutex;
64
32
mcla::AndroidNativeDisplayContainer* default_display_container{nullptr};
65
33
66
34
extern "C" int __attribute__((destructor)) destroy()
67
35
{
68
36
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
69
37
70
38
    delete default_display_container;
71
39
72
40
    return 0;
73
41
}
74
42
}
75
29
43
76
30
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
44
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
77
31
{
45
{
79
32
    return default_display_container;
46
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
80
47
81
48
    if (!default_display_container)
82
49
        default_display_container = new mcla::AndroidNativeDisplayContainer;
83
50
84
51
    return *default_display_container;
85
33
}
52
}
86
34
53
87
35
mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()
54
mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()
88
36
55
89
=== modified file 'src/client/connection_configuration.h'
90
--- src/client/connection_configuration.h	2014-05-29 13:21:08 +0000
91
+++ src/client/connection_configuration.h	2014-07-17 13:57:55 +0000
92
@@ -39,8 +39,11 @@
93
39
class Logger;
39
class Logger;
94
40
}
40
}
95
41
41
96
42
class SharedLibrary;
97
43
98
42
namespace client
44
namespace client
99
43
{
45
{
100
46
std::shared_ptr<SharedLibrary>& libraries_cache(std::string const& lib_name);
101
44
47
102
45
class ConnectionSurfaceMap;
48
class ConnectionSurfaceMap;
103
46
class Logger;
49
class Logger;
104
@@ -70,7 +73,6 @@
105
70
    ConnectionConfiguration(ConnectionConfiguration const&) = delete;
73
    ConnectionConfiguration(ConnectionConfiguration const&) = delete;
106
71
    ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;
74
    ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;
107
72
};
75
};
108
73
109
74
}
76
}
110
75
}
77
}
111
76
78
112
77
79
113
=== modified file 'src/client/default_connection_configuration.cpp'
114
--- src/client/default_connection_configuration.cpp	2014-07-16 16:28:55 +0000
115
+++ src/client/default_connection_configuration.cpp	2014-07-17 13:57:55 +0000
116
@@ -43,15 +43,10 @@
117
43
std::string const lttng_opt_val{"lttng"};
43
std::string const lttng_opt_val{"lttng"};
118
44
std::string const default_platform_lib{"libmirclientplatform.so"};
44
std::string const default_platform_lib{"libmirclientplatform.so"};
119
45
45
120
46
// TODO making this namespace scope extends its life slightly (and avoids a potential crash)
121
47
// TODO but we should manage it and ensure it is only released after the last connection dies
122
48
static std::map<std::string, std::shared_ptr<mir::SharedLibrary>> libraries_cache;
123
49
124
50
mir::SharedLibrary const* load_library(std::string const& libname)
46
mir::SharedLibrary const* load_library(std::string const& libname)
125
51
{
47
{
126
52
    // There's no point in loading twice, and it isn't safe to unload...
127
53
48
129
54
    if (auto& ptr = libraries_cache[libname])
49
    if (auto& ptr = mcl::libraries_cache(libname))
130
55
    {
50
    {
131
56
        return ptr.get();
51
        return ptr.get();
132
57
    }
52
    }
133
58
53
134
=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
135
--- src/client/mesa/mesa_native_display_container.cpp	2014-07-16 16:28:55 +0000
136
+++ src/client/mesa/mesa_native_display_container.cpp	2014-07-17 13:57:55 +0000
137
@@ -46,15 +46,30 @@
138
46
}
46
}
139
47
47
140
48
}
48
}
146
49
}
49
147
50
50
// default_display_container needs to live until the library is unloaded
148
51
// TODO making this namespace scope extends its life slightly (and avoids a potential crash)
51
std::mutex default_display_container_mutex;
149
52
// TODO but we should manage it and ensure it is only released after the last connection dies
52
mclm::MesaNativeDisplayContainer* default_display_container{nullptr};
150
53
static mclm::MesaNativeDisplayContainer default_display_container;
53
151
54
extern "C" int __attribute__((destructor)) destroy()
152
55
{
153
56
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
154
57
155
58
    delete default_display_container;
156
59
157
60
    return 0;
158
61
}
159
62
}
160
63
161
54
64
162
55
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
65
mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
163
56
{
66
{
165
57
    return default_display_container;
67
    std::lock_guard<std::mutex> lock(default_display_container_mutex);
166
68
167
69
    if (!default_display_container)
168
70
        default_display_container = new mclm::MesaNativeDisplayContainer;
169
71
170
72
    return *default_display_container;
171
58
}
73
}
172
59
74
173
60
mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
75
mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
174
61
76
175
=== modified file 'src/client/mir_connection.cpp'
176
--- src/client/mir_connection.cpp	2014-07-16 15:10:56 +0000
177
+++ src/client/mir_connection.cpp	2014-07-17 13:57:55 +0000
178
@@ -63,11 +63,48 @@
179
63
    MirDisplayConfiguration* const config;
63
    MirDisplayConfiguration* const config;
180
64
};
64
};
181
65
65
182
66
using LibrariesCache = std::map<std::string, std::shared_ptr<mir::SharedLibrary>>;
183
67
184
66
std::mutex connection_guard;
68
std::mutex connection_guard;
185
67
MirConnection* valid_connections{nullptr};
69
MirConnection* valid_connections{nullptr};
186
70
// There's no point in loading twice, and it isn't safe to
187
71
// unload while there are valid connections
188
72
std::map<std::string, std::shared_ptr<mir::SharedLibrary>>* libraries_cache_ptr{nullptr};
189
73
}
190
74
191
75
std::shared_ptr<mir::SharedLibrary>& mcl::libraries_cache(std::string const& libname)
192
76
{
193
77
    std::lock_guard<std::mutex> lock(connection_guard);
194
78
195
79
    if (!libraries_cache_ptr)
196
80
        libraries_cache_ptr = new LibrariesCache;
197
81
198
82
    return (*libraries_cache_ptr)[libname];
199
83
}
200
84
201
85
MirConnection::Deregisterer::~Deregisterer()
202
86
{
203
87
    std::lock_guard<std::mutex> lock(connection_guard);
204
88
205
89
    for (auto current = &valid_connections; *current; current = &(*current)->next_valid)
206
90
    {
207
91
        if (self == *current)
208
92
        {
209
93
            *current = self->next_valid;
210
94
            break;
211
95
        }
212
96
    }
213
97
214
98
    // When the last valid connection goes we can clear the libraries cache
215
99
    if (!valid_connections)
216
100
    {
217
101
        delete libraries_cache_ptr;
218
102
        libraries_cache_ptr = nullptr;
219
103
    }
220
68
}
104
}
221
69
105
222
70
MirConnection::MirConnection(std::string const& error_message) :
106
MirConnection::MirConnection(std::string const& error_message) :
223
107
    deregisterer{this},
224
71
    channel(),
108
    channel(),
225
72
    server(0),
109
    server(0),
226
73
    error_message(error_message)
110
    error_message(error_message)
227
@@ -76,6 +113,7 @@
228
76
113
229
77
MirConnection::MirConnection(
114
MirConnection::MirConnection(
230
78
    mir::client::ConnectionConfiguration& conf) :
115
    mir::client::ConnectionConfiguration& conf) :
231
116
        deregisterer{this},
232
79
        channel(conf.the_rpc_channel()),
117
        channel(conf.the_rpc_channel()),
233
80
        server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
118
        server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
234
81
        logger(conf.the_logger()),
119
        logger(conf.the_logger()),
235
@@ -100,19 +138,6 @@
236
100
    // 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.
237
101
    connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));
139
    connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));
238
102
140
239
103
    {
240
104
        std::lock_guard<std::mutex> lock(connection_guard);
241
105
242
106
        for (auto current = &valid_connections; *current; current = &(*current)->next_valid)
243
107
        {
244
108
            if (this == *current)
245
109
            {
246
110
                *current = next_valid;
247
111
                break;
248
112
            }
249
113
        }
250
114
    }
251
115
252
116
    std::lock_guard<decltype(mutex)> lock(mutex);
141
    std::lock_guard<decltype(mutex)> lock(mutex);
253
117
    if (connect_result.has_platform())
142
    if (connect_result.has_platform())
254
118
    {
143
    {
255
119
144
256
=== modified file 'src/client/mir_connection.h'
257
--- src/client/mir_connection.h	2014-07-16 15:10:56 +0000
258
+++ src/client/mir_connection.h	2014-07-17 13:57:55 +0000
259
@@ -134,6 +134,10 @@
260
134
    mir::protobuf::DisplayServer& display_server();
134
    mir::protobuf::DisplayServer& display_server();
261
135
135
262
136
private:
136
private:
263
137
    // MUST be first data member so it is destroyed last.
264
138
    struct Deregisterer
265
139
    { MirConnection* const self; ~Deregisterer(); } deregisterer;
266
140
267
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)
268
138
142
269
139
    std::shared_ptr<google::protobuf::RpcChannel> const channel;
143
    std::shared_ptr<google::protobuf::RpcChannel> const channel;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-07-18
Mir development team		2014-07-17	Pending
Review via email: mp+227188@code.launchpad.net
1	=== modified file 'examples/basic.c'
2	--- examples/basic.c 2014-03-06 06:05:17 +0000
3	+++ examples/basic.c 2014-07-17 13:57:55 +0000
4	@@ -88,11 +88,25 @@
5	88	}	88	}
6	89	///\internal [Callback_tag]	89	///\internal [Callback_tag]
7	90		90
8			91	MirDemoState mcd = {0, 0};
9			92
10			93	static void close_connection()
11			94	{
12			95	if (mcd.connection)
13			96	{
14			97	///\internal [connection_release_tag]
15			98	mir_connection_release(mcd.connection);
16			99	puts("Connection released");
17			100	///\internal [connection_release_tag]
18			101	}
19			102	}
20			103
21	91	void demo_client(const char* server, int buffer_swap_count)	104	void demo_client(const char* server, int buffer_swap_count)
22	92	{	105	{
23	93	MirDemoState mcd;
24	94	mcd.connection = 0;	106	mcd.connection = 0;
25	95	mcd.surface = 0;	107	mcd.surface = 0;
26			108	// We should always release our connection
27			109	atexit(&close_connection);
28	96		110
29	97	puts("Starting");	111	puts("Starting");
30	98		112
31	@@ -182,12 +196,6 @@
32	182	mir_wait_for(mir_surface_release(mcd.surface, surface_release_callback, &mcd));	196	mir_wait_for(mir_surface_release(mcd.surface, surface_release_callback, &mcd));
33	183	puts("Surface released");	197	puts("Surface released");
34	184	///\internal [surface_release_tag]	198	///\internal [surface_release_tag]
35	185
36	186	///\internal [connection_release_tag]
37	187	// We should release our connection
38	188	mir_connection_release(mcd.connection);
39	189	puts("Connection released");
40	190	///\internal [connection_release_tag]
41	191	}	199	}
42	192		200
43	193	// The main() function deals with parsing arguments and defaults	201	// The main() function deals with parsing arguments and defaults
44	194		202
45	=== modified file 'src/client/android/android_native_display_container.cpp'
46	--- src/client/android/android_native_display_container.cpp 2014-07-16 16:28:55 +0000
47	+++ src/client/android/android_native_display_container.cpp 2014-07-17 13:57:55 +0000
48	@@ -20,16 +20,35 @@
49	20		20
50	21	#include "mir_toolkit/mir_client_library.h"	21	#include "mir_toolkit/mir_client_library.h"
51	22		22
52			23	#include <mutex>
53			24
54	23	namespace mcl = mir::client;	25	namespace mcl = mir::client;
55	24	namespace mcla = mcl::android;	26	namespace mcla = mcl::android;
56	25		27
60	26	// TODO making this namespace scope extends its life slightly (and avoids a potential crash)	28	namespace
61	27	// TODO but we should manage it and ensure it is only released after the last connection dies	29	{
62	28	static mcla::AndroidNativeDisplayContainer default_display_container;	30	// default_display_container needs to live until the library is unloaded
63			31	std::mutex default_display_container_mutex;
64			32	mcla::AndroidNativeDisplayContainer* default_display_container{nullptr};
65			33
66			34	extern "C" int __attribute__((destructor)) destroy()
67			35	{
68			36	std::lock_guard<std::mutex> lock(default_display_container_mutex);
69			37
70			38	delete default_display_container;
71			39
72			40	return 0;
73			41	}
74			42	}
75	29		43
76	30	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()	44	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
77	31	{	45	{
79	32	return default_display_container;	46	std::lock_guard<std::mutex> lock(default_display_container_mutex);
80			47
81			48	if (!default_display_container)
82			49	default_display_container = new mcla::AndroidNativeDisplayContainer;
83			50
84			51	return *default_display_container;
85	33	}	52	}
86	34		53
87	35	mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()	54	mcla::AndroidNativeDisplayContainer::AndroidNativeDisplayContainer()
88	36		55
89	=== modified file 'src/client/connection_configuration.h'
90	--- src/client/connection_configuration.h 2014-05-29 13:21:08 +0000
91	+++ src/client/connection_configuration.h 2014-07-17 13:57:55 +0000
92	@@ -39,8 +39,11 @@
93	39	class Logger;	39	class Logger;
94	40	}	40	}
95	41		41
96			42	class SharedLibrary;
97			43
98	42	namespace client	44	namespace client
99	43	{	45	{
100			46	std::shared_ptr<SharedLibrary>& libraries_cache(std::string const& lib_name);
101	44		47
102	45	class ConnectionSurfaceMap;	48	class ConnectionSurfaceMap;
103	46	class Logger;	49	class Logger;
104	@@ -70,7 +73,6 @@
105	70	ConnectionConfiguration(ConnectionConfiguration const&) = delete;	73	ConnectionConfiguration(ConnectionConfiguration const&) = delete;
106	71	ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;	74	ConnectionConfiguration& operator=(ConnectionConfiguration const&) = delete;
107	72	};	75	};
108	73
109	74	}	76	}
110	75	}	77	}
111	76		78
112	77		79
113	=== modified file 'src/client/default_connection_configuration.cpp'
114	--- src/client/default_connection_configuration.cpp 2014-07-16 16:28:55 +0000
115	+++ src/client/default_connection_configuration.cpp 2014-07-17 13:57:55 +0000
116	@@ -43,15 +43,10 @@
117	43	std::string const lttng_opt_val{"lttng"};	43	std::string const lttng_opt_val{"lttng"};
118	44	std::string const default_platform_lib{"libmirclientplatform.so"};	44	std::string const default_platform_lib{"libmirclientplatform.so"};
119	45		45
120	46	// TODO making this namespace scope extends its life slightly (and avoids a potential crash)
121	47	// TODO but we should manage it and ensure it is only released after the last connection dies
122	48	static std::map<std::string, std::shared_ptr<mir::SharedLibrary>> libraries_cache;
123	49
124	50	mir::SharedLibrary const* load_library(std::string const& libname)	46	mir::SharedLibrary const* load_library(std::string const& libname)
125	51	{	47	{
126	52	// There's no point in loading twice, and it isn't safe to unload...
127	53		48
129	54	if (auto& ptr = libraries_cache[libname])	49	if (auto& ptr = mcl::libraries_cache(libname))
130	55	{	50	{
131	56	return ptr.get();	51	return ptr.get();
132	57	}	52	}
133	58		53
134	=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
135	--- src/client/mesa/mesa_native_display_container.cpp 2014-07-16 16:28:55 +0000
136	+++ src/client/mesa/mesa_native_display_container.cpp 2014-07-17 13:57:55 +0000
137	@@ -46,15 +46,30 @@
138	46	}	46	}
139	47		47
140	48	}	48	}
146	49	}	49
147	50		50	// default_display_container needs to live until the library is unloaded
148	51	// TODO making this namespace scope extends its life slightly (and avoids a potential crash)	51	std::mutex default_display_container_mutex;
149	52	// TODO but we should manage it and ensure it is only released after the last connection dies	52	mclm::MesaNativeDisplayContainer* default_display_container{nullptr};
150	53	static mclm::MesaNativeDisplayContainer default_display_container;	53
151			54	extern "C" int __attribute__((destructor)) destroy()
152			55	{
153			56	std::lock_guard<std::mutex> lock(default_display_container_mutex);
154			57
155			58	delete default_display_container;
156			59
157			60	return 0;
158			61	}
159			62	}
160			63
161	54		64
162	55	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()	65	mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
163	56	{	66	{
165	57	return default_display_container;	67	std::lock_guard<std::mutex> lock(default_display_container_mutex);
166			68
167			69	if (!default_display_container)
168			70	default_display_container = new mclm::MesaNativeDisplayContainer;
169			71
170			72	return *default_display_container;
171	58	}	73	}
172	59		74
173	60	mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()	75	mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
174	61		76
175	=== modified file 'src/client/mir_connection.cpp'
176	--- src/client/mir_connection.cpp 2014-07-16 15:10:56 +0000
177	+++ src/client/mir_connection.cpp 2014-07-17 13:57:55 +0000
178	@@ -63,11 +63,48 @@
179	63	MirDisplayConfiguration* const config;	63	MirDisplayConfiguration* const config;
180	64	};	64	};
181	65		65
182			66	using LibrariesCache = std::map<std::string, std::shared_ptr<mir::SharedLibrary>>;
183			67
184	66	std::mutex connection_guard;	68	std::mutex connection_guard;
185	67	MirConnection* valid_connections{nullptr};	69	MirConnection* valid_connections{nullptr};
186			70	// There's no point in loading twice, and it isn't safe to
187			71	// unload while there are valid connections
188			72	std::map<std::string, std::shared_ptr<mir::SharedLibrary>>* libraries_cache_ptr{nullptr};
189			73	}
190			74
191			75	std::shared_ptr<mir::SharedLibrary>& mcl::libraries_cache(std::string const& libname)
192			76	{
193			77	std::lock_guard<std::mutex> lock(connection_guard);
194			78
195			79	if (!libraries_cache_ptr)
196			80	libraries_cache_ptr = new LibrariesCache;
197			81
198			82	return (*libraries_cache_ptr)[libname];
199			83	}
200			84
201			85	MirConnection::Deregisterer::~Deregisterer()
202			86	{
203			87	std::lock_guard<std::mutex> lock(connection_guard);
204			88
205			89	for (auto current = &valid_connections; current; current = &(current)->next_valid)
206			90	{
207			91	if (self == *current)
208			92	{
209			93	*current = self->next_valid;
210			94	break;
211			95	}
212			96	}
213			97
214			98	// When the last valid connection goes we can clear the libraries cache
215			99	if (!valid_connections)
216			100	{
217			101	delete libraries_cache_ptr;
218			102	libraries_cache_ptr = nullptr;
219			103	}
220	68	}	104	}
221	69		105
222	70	MirConnection::MirConnection(std::string const& error_message) :	106	MirConnection::MirConnection(std::string const& error_message) :
223			107	deregisterer{this},
224	71	channel(),	108	channel(),
225	72	server(0),	109	server(0),
226	73	error_message(error_message)	110	error_message(error_message)
227	@@ -76,6 +113,7 @@
228	76		113
229	77	MirConnection::MirConnection(	114	MirConnection::MirConnection(
230	78	mir::client::ConnectionConfiguration& conf) :	115	mir::client::ConnectionConfiguration& conf) :
231			116	deregisterer{this},
232	79	channel(conf.the_rpc_channel()),	117	channel(conf.the_rpc_channel()),
233	80	server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),	118	server(channel.get(), ::google::protobuf::Service::STUB_DOESNT_OWN_CHANNEL),
234	81	logger(conf.the_logger()),	119	logger(conf.the_logger()),
235	@@ -100,19 +138,6 @@
236	100	// 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.
237	101	connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));	139	connect_wait_handle.wait_for_pending(std::chrono::milliseconds(500));
238	102		140
239	103	{
240	104	std::lock_guard<std::mutex> lock(connection_guard);
241	105
242	106	for (auto current = &valid_connections; current; current = &(current)->next_valid)
243	107	{
244	108	if (this == *current)
245	109	{
246	110	*current = next_valid;
247	111	break;
248	112	}
249	113	}
250	114	}
251	115
252	116	std::lock_guard<decltype(mutex)> lock(mutex);	141	std::lock_guard<decltype(mutex)> lock(mutex);
253	117	if (connect_result.has_platform())	142	if (connect_result.has_platform())
254	118	{	143	{
255	119		144
256	=== modified file 'src/client/mir_connection.h'
257	--- src/client/mir_connection.h 2014-07-16 15:10:56 +0000
258	+++ src/client/mir_connection.h 2014-07-17 13:57:55 +0000
259	@@ -134,6 +134,10 @@
260	134	mir::protobuf::DisplayServer& display_server();	134	mir::protobuf::DisplayServer& display_server();
261	135		135
262	136	private:	136	private:
263			137	// MUST be first data member so it is destroyed last.
264			138	struct Deregisterer
265			139	{ MirConnection* const self; ~Deregisterer(); } deregisterer;
266			140
267	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)
268	138		142
269	139	std::shared_ptr<google::protobuf::RpcChannel> const channel;	143	std::shared_ptr<google::protobuf::RpcChannel> const channel;