1
=== modified file 'src/client/connection_surface_map.cpp'
2
--- src/client/connection_surface_map.cpp	2016-12-02 05:05:06 +0000
3
+++ src/client/connection_surface_map.cpp	2016-12-08 10:07:47 +0000
4
@@ -26,23 +26,15 @@
5
26
namespace mcl=mir::client;
26
namespace mcl=mir::client;
6
27
namespace mf=mir::frontend;
27
namespace mf=mir::frontend;
7
28
28
10
29
void mcl::ConnectionSurfaceMap::with_surface_do(
29
using mir::client::ConnectionSurfaceMap;
11
30
    mf::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const
30
using mir::frontend::SurfaceId;
12
31
using mir::frontend::BufferStreamId;
13
32
14
33
std::shared_ptr<MirSurface> ConnectionSurfaceMap::surface(SurfaceId id) const
15
31
{
34
{
16
32
    std::shared_lock<decltype(guard)> lk(guard);
35
    std::shared_lock<decltype(guard)> lk(guard);
30
33
    auto const it = surfaces.find(surface_id);
36
    auto const found = surfaces.find(id);
31
34
    if (it != surfaces.end())
37
    return found != surfaces.end() ? found->second : nullptr;
19
35
    {
20
36
        auto const surface = it->second;
21
37
        lk.unlock();
22
38
        exec(surface.get());
23
39
    }
24
40
    else
25
41
    {
26
42
        std::stringstream ss;
27
43
        ss << __PRETTY_FUNCTION__ << "executed with non-existent surface ID " << surface_id;
28
44
        BOOST_THROW_EXCEPTION(std::runtime_error(ss.str()));
29
45
    }
32
46
}
38
}
33
47
39
34
48
void mcl::ConnectionSurfaceMap::insert(mf::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface)
40
void mcl::ConnectionSurfaceMap::insert(mf::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface)
35
@@ -57,23 +49,11 @@
36
57
    surfaces.erase(surface_id);
49
    surfaces.erase(surface_id);
37
58
}
50
}
38
59
51
41
60
void mcl::ConnectionSurfaceMap::with_stream_do(
52
std::shared_ptr<MirBufferStream> ConnectionSurfaceMap::stream(BufferStreamId id) const
40
61
    mf::BufferStreamId stream_id, std::function<void(MirBufferStream*)> const& exec) const
42
62
{
53
{
43
63
    std::shared_lock<decltype(stream_guard)> lk(stream_guard);
54
    std::shared_lock<decltype(stream_guard)> lk(stream_guard);
57
64
    auto const it = streams.find(stream_id);
55
    auto const found = streams.find(id);
58
65
    if (it != streams.end())
56
    return found != streams.end() ? found->second : nullptr;
46
66
    {
47
67
        auto const stream = it->second;
48
68
        lk.unlock();
49
69
        exec(stream.get());
50
70
    }
51
71
    else
52
72
    {
53
73
        std::stringstream ss;
54
74
        ss << __PRETTY_FUNCTION__ << "executed with non-existent stream ID " << stream_id;
55
75
        BOOST_THROW_EXCEPTION(std::runtime_error(ss.str()));
56
76
    }
59
77
}
57
}
60
78
58
61
79
void mcl::ConnectionSurfaceMap::with_all_streams_do(std::function<void(MirBufferStream*)> const& fn) const
59
void mcl::ConnectionSurfaceMap::with_all_streams_do(std::function<void(MirBufferStream*)> const& fn) const
62
80
60
63
=== modified file 'src/client/connection_surface_map.h'
64
--- src/client/connection_surface_map.h	2016-12-02 05:05:06 +0000
65
+++ src/client/connection_surface_map.h	2016-12-08 10:07:47 +0000
66
@@ -34,11 +34,11 @@
67
34
class ConnectionSurfaceMap : public SurfaceMap
34
class ConnectionSurfaceMap : public SurfaceMap
68
35
{
35
{
69
36
public:
36
public:
71
37
    void with_surface_do(frontend::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const override;
37
    virtual std::shared_ptr<MirSurface> surface(frontend::SurfaceId) const override;
72
38
    void insert(frontend::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface);
38
    void insert(frontend::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface);
73
39
    void erase(frontend::SurfaceId surface_id);
39
    void erase(frontend::SurfaceId surface_id);
74
40
40
76
41
    void with_stream_do(frontend::BufferStreamId stream_id, std::function<void(MirBufferStream*)> const& exec) const override;
41
    virtual std::shared_ptr<MirBufferStream> stream(frontend::BufferStreamId) const override;
77
42
    void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override;
42
    void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override;
78
43
43
79
44
    void insert(frontend::BufferStreamId stream_id, std::shared_ptr<MirBufferStream> const& chain);
44
    void insert(frontend::BufferStreamId stream_id, std::shared_ptr<MirBufferStream> const& chain);
80
45
45
81
=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
82
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-12-02 05:05:06 +0000
83
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2016-12-08 10:07:47 +0000
84
@@ -312,10 +312,9 @@
85
312
            {
312
            {
86
313
                if (seq.buffer_request().has_id())
313
                if (seq.buffer_request().has_id())
87
314
                {
314
                {
90
315
                    map->with_stream_do(mf::BufferStreamId(seq.buffer_request().id().value()),
315
                    mf::BufferStreamId stream_id(seq.buffer_request().id().value());
91
316
                    [&] (MirBufferStream* receiver) {
316
                    if (auto receiver = map->stream(stream_id))
92
317
                        receiver->buffer_available(seq.buffer_request().buffer());
317
                        receiver->buffer_available(seq.buffer_request().buffer());
93
318
                    });
94
319
                }
318
                }
95
320
                
319
                
96
321
                else if (seq.buffer_request().has_operation())
320
                else if (seq.buffer_request().has_operation())
97
@@ -372,46 +371,41 @@
98
372
                {
371
                {
99
373
                    rpc_report->event_parsing_succeeded(*e);
372
                    rpc_report->event_parsing_succeeded(*e);
100
374
373
103
375
                    auto const send_e = [&e](MirSurface* surface)
374
                    int surface_id = 0;
104
376
                        { surface->handle_event(*e); };
375
                    bool is_surface_event = true;
105
377
376
106
378
                    switch (e->type())
377
                    switch (e->type())
107
379
                    {
378
                    {
108
380
                    case mir_event_type_surface:
379
                    case mir_event_type_surface:
111
381
                        if (auto map = surface_map.lock())
380
                        surface_id = e->to_surface()->id();
110
382
                            map->with_surface_do(mf::SurfaceId(e->to_surface()->id()), send_e);
112
383
                        break;
381
                        break;
113
384
114
385
                    case mir_event_type_resize:
382
                    case mir_event_type_resize:
117
386
                        if (auto map = surface_map.lock())
383
                        surface_id = e->to_resize()->surface_id();
116
387
                            map->with_surface_do(mf::SurfaceId(e->to_resize()->surface_id()), send_e);
118
388
                        break;
384
                        break;
119
389
120
390
                    case mir_event_type_orientation:
385
                    case mir_event_type_orientation:
123
391
                        if (auto map = surface_map.lock())
386
                        surface_id = e->to_orientation()->surface_id();
122
392
                            map->with_surface_do(mf::SurfaceId(e->to_orientation()->surface_id()), send_e);
124
393
                        break;
387
                        break;
125
394
126
395
                    case mir_event_type_close_surface:
388
                    case mir_event_type_close_surface:
129
396
                        if (auto map = surface_map.lock())
389
                        surface_id = e->to_close_surface()->surface_id();
128
397
                            map->with_surface_do(mf::SurfaceId(e->to_close_surface()->surface_id()), send_e);
130
398
                        break;
390
                        break;
131
399
                    case mir_event_type_keymap:
391
                    case mir_event_type_keymap:
134
400
                        if (auto map = surface_map.lock())
392
                        surface_id = e->to_keymap()->surface_id();
133
401
                            map->with_surface_do(mf::SurfaceId(e->to_keymap()->surface_id()), send_e);
135
402
                        break;
393
                        break;
136
403
                    case mir_event_type_surface_output:
394
                    case mir_event_type_surface_output:
139
404
                        if (auto map = surface_map.lock())
395
                        surface_id = e->to_surface_output()->surface_id();
138
405
                            map->with_surface_do(mf::SurfaceId(e->to_surface_output()->surface_id()), send_e);
140
406
                        break;
396
                        break;
141
407
                    case mir_event_type_surface_placement:
397
                    case mir_event_type_surface_placement:
144
408
                        if (auto map = surface_map.lock())
398
                        surface_id = e->to_surface_placement()->id();
143
409
                            map->with_surface_do(mf::SurfaceId(e->to_surface_placement()->id()), send_e);
145
410
                        break;
399
                        break;
146
411
147
412
                    default:
400
                    default:
148
401
                        is_surface_event = false;
149
413
                        event_sink->handle_event(*e);
402
                        event_sink->handle_event(*e);
150
414
                    }
403
                    }
151
404
152
405
                    if (is_surface_event)
153
406
                        if (auto map = surface_map.lock())
154
407
                            if (auto surf = map->surface(mf::SurfaceId(surface_id)))
155
408
                                surf->handle_event(*e);
156
415
                }
409
                }
157
416
            }
410
            }
158
417
            catch(...)
411
            catch(...)
159
418
412
160
=== modified file 'src/client/surface_map.h'
161
--- src/client/surface_map.h	2016-12-02 05:05:06 +0000
162
+++ src/client/surface_map.h	2016-12-08 10:07:47 +0000
163
@@ -40,10 +40,8 @@
164
40
class SurfaceMap
40
class SurfaceMap
165
41
{
41
{
166
42
public:
42
public:
171
43
    virtual void with_surface_do(
43
    virtual std::shared_ptr<MirSurface> surface(frontend::SurfaceId) const = 0;
172
44
        frontend::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const = 0;
44
    virtual std::shared_ptr<MirBufferStream> stream(frontend::BufferStreamId) const = 0;
169
45
    virtual void with_stream_do(
170
46
        frontend::BufferStreamId stream_id, std::function<void(MirBufferStream*)> const& exec) const = 0;
173
47
    virtual void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const = 0;
45
    virtual void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const = 0;
174
48
    virtual std::shared_ptr<MirBuffer> buffer(int buffer_id) const = 0;
46
    virtual std::shared_ptr<MirBuffer> buffer(int buffer_id) const = 0;
175
49
    virtual void insert(int buffer_id, std::shared_ptr<MirBuffer> const& buffer) = 0;
47
    virtual void insert(int buffer_id, std::shared_ptr<MirBuffer> const& buffer) = 0;
176
50
48
177
=== modified file 'tests/unit-tests/client/test_connection_resource_map.cpp'
178
--- tests/unit-tests/client/test_connection_resource_map.cpp	2016-12-02 05:05:06 +0000
179
+++ tests/unit-tests/client/test_connection_resource_map.cpp	2016-12-08 10:07:47 +0000
180
@@ -56,15 +56,9 @@
181
56
TEST_F(ConnectionResourceMap, maps_surface_when_surface_inserted)
56
TEST_F(ConnectionResourceMap, maps_surface_when_surface_inserted)
182
57
{
57
{
183
58
    using namespace testing;
58
    using namespace testing;
184
59
    auto surface_called = false;
185
60
    mcl::ConnectionSurfaceMap map;
59
    mcl::ConnectionSurfaceMap map;
186
61
    map.insert(surface_id, surface);
60
    map.insert(surface_id, surface);
193
62
    map.with_surface_do(surface_id, [&](MirSurface* surf) {
61
    EXPECT_EQ(surface, map.surface(surface_id));
188
63
        EXPECT_THAT(surf, Eq(surface.get()));
189
64
        surface_called = true;
190
65
    });
191
66
192
67
    EXPECT_TRUE(surface_called);
194
68
}
62
}
195
69
63
196
70
TEST_F(ConnectionResourceMap, removes_surface_when_surface_removed)
64
TEST_F(ConnectionResourceMap, removes_surface_when_surface_removed)
197
@@ -73,22 +67,15 @@
198
73
    mcl::ConnectionSurfaceMap map;
67
    mcl::ConnectionSurfaceMap map;
199
74
    map.insert(surface_id, surface);
68
    map.insert(surface_id, surface);
200
75
    map.erase(surface_id);
69
    map.erase(surface_id);
204
76
    EXPECT_THROW({
70
    EXPECT_FALSE(map.stream(stream_id));
202
77
        map.with_stream_do(stream_id, [](MirBufferStream*){});
203
78
    }, std::runtime_error);
205
79
}
71
}
206
80
72
207
81
TEST_F(ConnectionResourceMap, maps_streams)
73
TEST_F(ConnectionResourceMap, maps_streams)
208
82
{
74
{
209
83
    using namespace testing;
75
    using namespace testing;
210
84
    auto stream_called = false;
211
85
    mcl::ConnectionSurfaceMap map;
76
    mcl::ConnectionSurfaceMap map;
212
86
    map.insert(stream_id, stream);
77
    map.insert(stream_id, stream);
218
87
    map.with_stream_do(stream_id, [&](MirBufferStream* str) {
78
    EXPECT_EQ(stream, map.stream(stream_id));
214
88
        EXPECT_THAT(str, Eq(stream.get()));
215
89
        stream_called = true;
216
90
    });
217
91
    EXPECT_TRUE(stream_called);
219
92
    map.erase(stream_id);
79
    map.erase(stream_id);
220
93
}
80
}
221
94
81
222
@@ -126,11 +113,7 @@
223
126
    mcl::ConnectionSurfaceMap map;
113
    mcl::ConnectionSurfaceMap map;
224
127
    map.insert(buffer_id, buffer);
114
    map.insert(buffer_id, buffer);
225
128
    map.insert(surface_id, surface);
115
    map.insert(surface_id, surface);
231
129
116
    EXPECT_EQ(buffer, map.buffer(buffer_id));
227
130
    map.with_surface_do(surface_id,
228
131
        [this, &map](auto) {
229
132
            EXPECT_THAT(map.buffer(buffer_id), Eq(buffer));
230
133
        });
232
134
}
117
}
233
135
118
234
136
TEST_F(ConnectionResourceMap, can_insert_retrieve_erase_render_surface)
119
TEST_F(ConnectionResourceMap, can_insert_retrieve_erase_render_surface)
235
137
120
236
=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
237
--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2016-12-02 05:05:06 +0000
238
+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp	2016-12-08 10:07:47 +0000
239
@@ -59,10 +59,8 @@
240
59
59
241
60
struct MockSurfaceMap : mcl::SurfaceMap
60
struct MockSurfaceMap : mcl::SurfaceMap
242
61
{
61
{
247
62
    MOCK_CONST_METHOD2(with_surface_do,
62
    MOCK_CONST_METHOD1(surface, std::shared_ptr<MirSurface>(mir::frontend::SurfaceId));
248
63
        void(mir::frontend::SurfaceId, std::function<void(MirSurface*)> const&));
63
    MOCK_CONST_METHOD1(stream, std::shared_ptr<MirBufferStream>(mir::frontend::BufferStreamId));
245
64
    MOCK_CONST_METHOD2(with_stream_do,
246
65
        void(mir::frontend::BufferStreamId, std::function<void(MirBufferStream*)> const&));
249
66
    MOCK_CONST_METHOD1(with_all_streams_do,
64
    MOCK_CONST_METHOD1(with_all_streams_do,
250
67
        void(std::function<void(MirBufferStream*)> const&));
65
        void(std::function<void(MirBufferStream*)> const&));
251
68
    MOCK_CONST_METHOD1(buffer, std::shared_ptr<mcl::MirBuffer>(int));
66
    MOCK_CONST_METHOD1(buffer, std::shared_ptr<mcl::MirBuffer>(int));
252
@@ -74,13 +72,13 @@
253
74
class StubSurfaceMap : public mcl::SurfaceMap
72
class StubSurfaceMap : public mcl::SurfaceMap
254
75
{
73
{
255
76
public:
74
public:
258
77
    void with_surface_do(
75
    std::shared_ptr<MirSurface> surface(mir::frontend::SurfaceId) const override
257
78
        mir::frontend::SurfaceId, std::function<void(MirSurface*)> const&) const override
259
79
    {
76
    {
260
77
        return {};
261
80
    }
78
    }
264
81
    void with_stream_do(
79
    std::shared_ptr<MirBufferStream> stream(mir::frontend::BufferStreamId) const override
263
82
        mir::frontend::BufferStreamId, std::function<void(MirBufferStream*)> const&) const override
265
83
    {
80
    {
266
81
        return {};
267
84
    }
82
    }
268
85
    void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override
83
    void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override
269
86
    {
84
    {
270
@@ -796,7 +794,7 @@
271
796
    auto mock_buffer_factory = std::make_shared<MockBufferFactory>();
794
    auto mock_buffer_factory = std::make_shared<MockBufferFactory>();
272
797
    auto mock_client_buffer = std::make_shared<mtd::MockClientBuffer>();
795
    auto mock_client_buffer = std::make_shared<mtd::MockClientBuffer>();
273
798
    auto buf = std::make_shared<mcl::Buffer>(buffer_cb, nullptr, buffer_id, mock_client_buffer, nullptr, mir_buffer_usage_software);
796
    auto buf = std::make_shared<mcl::Buffer>(buffer_cb, nullptr, buffer_id, mock_client_buffer, nullptr, mir_buffer_usage_software);
275
799
    EXPECT_CALL(*stream_map, with_stream_do(mir::frontend::BufferStreamId{stream_id},_))
797
    EXPECT_CALL(*stream_map, stream(mir::frontend::BufferStreamId{stream_id}))
276
800
        .Times(1);
798
        .Times(1);
277
801
799
278
802
    auto transport = std::make_unique<NiceMock<MockStreamTransport>>();
800
    auto transport = std::make_unique<NiceMock<MockStreamTransport>>();
Status:	Merged
Approved by:	Daniel van Vugt on 2016-12-12
Approved revision:	no longer in the source branch.
Merged at revision:	3877
Proposed branch:	lp:~vanvugt/mir/simplify-single-object-accesses
Merge into:	lp:mir
Diff against target:	278 lines (+42/-89) 6 files modified src/client/connection_surface_map.cpp (+10/-30) src/client/connection_surface_map.h (+2/-2) src/client/rpc/mir_protobuf_rpc_channel.cpp (+17/-23) src/client/surface_map.h (+2/-4) tests/unit-tests/client/test_connection_resource_map.cpp (+4/-21) tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+7/-9)
To merge this branch:	bzr merge lp:~vanvugt/mir/simplify-single-object-accesses
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-12-12
Alan Griffiths		2016-12-08	Approve on 2016-12-09
Review via email: mp+312790@code.launchpad.net
1	=== modified file 'src/client/connection_surface_map.cpp'
2	--- src/client/connection_surface_map.cpp 2016-12-02 05:05:06 +0000
3	+++ src/client/connection_surface_map.cpp 2016-12-08 10:07:47 +0000
4	@@ -26,23 +26,15 @@
5	26	namespace mcl=mir::client;	26	namespace mcl=mir::client;
6	27	namespace mf=mir::frontend;	27	namespace mf=mir::frontend;
7	28		28
10	29	void mcl::ConnectionSurfaceMap::with_surface_do(	29	using mir::client::ConnectionSurfaceMap;
11	30	mf::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const	30	using mir::frontend::SurfaceId;
12			31	using mir::frontend::BufferStreamId;
13			32
14			33	std::shared_ptr<MirSurface> ConnectionSurfaceMap::surface(SurfaceId id) const
15	31	{	34	{
16	32	std::shared_lock<decltype(guard)> lk(guard);	35	std::shared_lock<decltype(guard)> lk(guard);
30	33	auto const it = surfaces.find(surface_id);	36	auto const found = surfaces.find(id);
31	34	if (it != surfaces.end())	37	return found != surfaces.end() ? found->second : nullptr;
19	35	{
20	36	auto const surface = it->second;
21	37	lk.unlock();
22	38	exec(surface.get());
23	39	}
24	40	else
25	41	{
26	42	std::stringstream ss;
27	43	ss << __PRETTY_FUNCTION__ << "executed with non-existent surface ID " << surface_id;
28	44	BOOST_THROW_EXCEPTION(std::runtime_error(ss.str()));
29	45	}
32	46	}	38	}
33	47		39
34	48	void mcl::ConnectionSurfaceMap::insert(mf::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface)	40	void mcl::ConnectionSurfaceMap::insert(mf::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface)
35	@@ -57,23 +49,11 @@
36	57	surfaces.erase(surface_id);	49	surfaces.erase(surface_id);
37	58	}	50	}
38	59		51
41	60	void mcl::ConnectionSurfaceMap::with_stream_do(	52	std::shared_ptr<MirBufferStream> ConnectionSurfaceMap::stream(BufferStreamId id) const
40	61	mf::BufferStreamId stream_id, std::function<void(MirBufferStream*)> const& exec) const
42	62	{	53	{
43	63	std::shared_lock<decltype(stream_guard)> lk(stream_guard);	54	std::shared_lock<decltype(stream_guard)> lk(stream_guard);
57	64	auto const it = streams.find(stream_id);	55	auto const found = streams.find(id);
58	65	if (it != streams.end())	56	return found != streams.end() ? found->second : nullptr;
46	66	{
47	67	auto const stream = it->second;
48	68	lk.unlock();
49	69	exec(stream.get());
50	70	}
51	71	else
52	72	{
53	73	std::stringstream ss;
54	74	ss << __PRETTY_FUNCTION__ << "executed with non-existent stream ID " << stream_id;
55	75	BOOST_THROW_EXCEPTION(std::runtime_error(ss.str()));
56	76	}
59	77	}	57	}
60	78		58
61	79	void mcl::ConnectionSurfaceMap::with_all_streams_do(std::function<void(MirBufferStream*)> const& fn) const	59	void mcl::ConnectionSurfaceMap::with_all_streams_do(std::function<void(MirBufferStream*)> const& fn) const
62	80		60
63	=== modified file 'src/client/connection_surface_map.h'
64	--- src/client/connection_surface_map.h 2016-12-02 05:05:06 +0000
65	+++ src/client/connection_surface_map.h 2016-12-08 10:07:47 +0000
66	@@ -34,11 +34,11 @@
67	34	class ConnectionSurfaceMap : public SurfaceMap	34	class ConnectionSurfaceMap : public SurfaceMap
68	35	{	35	{
69	36	public:	36	public:
71	37	void with_surface_do(frontend::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const override;	37	virtual std::shared_ptr<MirSurface> surface(frontend::SurfaceId) const override;
72	38	void insert(frontend::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface);	38	void insert(frontend::SurfaceId surface_id, std::shared_ptr<MirSurface> const& surface);
73	39	void erase(frontend::SurfaceId surface_id);	39	void erase(frontend::SurfaceId surface_id);
74	40		40
76	41	void with_stream_do(frontend::BufferStreamId stream_id, std::function<void(MirBufferStream*)> const& exec) const override;	41	virtual std::shared_ptr<MirBufferStream> stream(frontend::BufferStreamId) const override;
77	42	void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override;	42	void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override;
78	43		43
79	44	void insert(frontend::BufferStreamId stream_id, std::shared_ptr<MirBufferStream> const& chain);	44	void insert(frontend::BufferStreamId stream_id, std::shared_ptr<MirBufferStream> const& chain);
80	45		45
81	=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
82	--- src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-12-02 05:05:06 +0000
83	+++ src/client/rpc/mir_protobuf_rpc_channel.cpp 2016-12-08 10:07:47 +0000
84	@@ -312,10 +312,9 @@
85	312	{	312	{
86	313	if (seq.buffer_request().has_id())	313	if (seq.buffer_request().has_id())
87	314	{	314	{
90	315	map->with_stream_do(mf::BufferStreamId(seq.buffer_request().id().value()),	315	mf::BufferStreamId stream_id(seq.buffer_request().id().value());
91	316	[&] (MirBufferStream* receiver) {	316	if (auto receiver = map->stream(stream_id))
92	317	receiver->buffer_available(seq.buffer_request().buffer());	317	receiver->buffer_available(seq.buffer_request().buffer());
93	318	});
94	319	}	318	}
95	320		319
96	321	else if (seq.buffer_request().has_operation())	320	else if (seq.buffer_request().has_operation())
97	@@ -372,46 +371,41 @@
98	372	{	371	{
99	373	rpc_report->event_parsing_succeeded(*e);	372	rpc_report->event_parsing_succeeded(*e);
100	374		373
103	375	auto const send_e = [&e](MirSurface* surface)	374	int surface_id = 0;
104	376	{ surface->handle_event(*e); };	375	bool is_surface_event = true;
105	377		376
106	378	switch (e->type())	377	switch (e->type())
107	379	{	378	{
108	380	case mir_event_type_surface:	379	case mir_event_type_surface:
111	381	if (auto map = surface_map.lock())	380	surface_id = e->to_surface()->id();
110	382	map->with_surface_do(mf::SurfaceId(e->to_surface()->id()), send_e);
112	383	break;	381	break;
113	384
114	385	case mir_event_type_resize:	382	case mir_event_type_resize:
117	386	if (auto map = surface_map.lock())	383	surface_id = e->to_resize()->surface_id();
116	387	map->with_surface_do(mf::SurfaceId(e->to_resize()->surface_id()), send_e);
118	388	break;	384	break;
119	389
120	390	case mir_event_type_orientation:	385	case mir_event_type_orientation:
123	391	if (auto map = surface_map.lock())	386	surface_id = e->to_orientation()->surface_id();
122	392	map->with_surface_do(mf::SurfaceId(e->to_orientation()->surface_id()), send_e);
124	393	break;	387	break;
125	394
126	395	case mir_event_type_close_surface:	388	case mir_event_type_close_surface:
129	396	if (auto map = surface_map.lock())	389	surface_id = e->to_close_surface()->surface_id();
128	397	map->with_surface_do(mf::SurfaceId(e->to_close_surface()->surface_id()), send_e);
130	398	break;	390	break;
131	399	case mir_event_type_keymap:	391	case mir_event_type_keymap:
134	400	if (auto map = surface_map.lock())	392	surface_id = e->to_keymap()->surface_id();
133	401	map->with_surface_do(mf::SurfaceId(e->to_keymap()->surface_id()), send_e);
135	402	break;	393	break;
136	403	case mir_event_type_surface_output:	394	case mir_event_type_surface_output:
139	404	if (auto map = surface_map.lock())	395	surface_id = e->to_surface_output()->surface_id();
138	405	map->with_surface_do(mf::SurfaceId(e->to_surface_output()->surface_id()), send_e);
140	406	break;	396	break;
141	407	case mir_event_type_surface_placement:	397	case mir_event_type_surface_placement:
144	408	if (auto map = surface_map.lock())	398	surface_id = e->to_surface_placement()->id();
143	409	map->with_surface_do(mf::SurfaceId(e->to_surface_placement()->id()), send_e);
145	410	break;	399	break;
146	411
147	412	default:	400	default:
148			401	is_surface_event = false;
149	413	event_sink->handle_event(*e);	402	event_sink->handle_event(*e);
150	414	}	403	}
151			404
152			405	if (is_surface_event)
153			406	if (auto map = surface_map.lock())
154			407	if (auto surf = map->surface(mf::SurfaceId(surface_id)))
155			408	surf->handle_event(*e);
156	415	}	409	}
157	416	}	410	}
158	417	catch(...)	411	catch(...)
159	418		412
160	=== modified file 'src/client/surface_map.h'
161	--- src/client/surface_map.h 2016-12-02 05:05:06 +0000
162	+++ src/client/surface_map.h 2016-12-08 10:07:47 +0000
163	@@ -40,10 +40,8 @@
164	40	class SurfaceMap	40	class SurfaceMap
165	41	{	41	{
166	42	public:	42	public:
171	43	virtual void with_surface_do(	43	virtual std::shared_ptr<MirSurface> surface(frontend::SurfaceId) const = 0;
172	44	frontend::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const = 0;	44	virtual std::shared_ptr<MirBufferStream> stream(frontend::BufferStreamId) const = 0;
169	45	virtual void with_stream_do(
170	46	frontend::BufferStreamId stream_id, std::function<void(MirBufferStream*)> const& exec) const = 0;
173	47	virtual void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const = 0;	45	virtual void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const = 0;
174	48	virtual std::shared_ptr<MirBuffer> buffer(int buffer_id) const = 0;	46	virtual std::shared_ptr<MirBuffer> buffer(int buffer_id) const = 0;
175	49	virtual void insert(int buffer_id, std::shared_ptr<MirBuffer> const& buffer) = 0;	47	virtual void insert(int buffer_id, std::shared_ptr<MirBuffer> const& buffer) = 0;
176	50		48
177	=== modified file 'tests/unit-tests/client/test_connection_resource_map.cpp'
178	--- tests/unit-tests/client/test_connection_resource_map.cpp 2016-12-02 05:05:06 +0000
179	+++ tests/unit-tests/client/test_connection_resource_map.cpp 2016-12-08 10:07:47 +0000
180	@@ -56,15 +56,9 @@
181	56	TEST_F(ConnectionResourceMap, maps_surface_when_surface_inserted)	56	TEST_F(ConnectionResourceMap, maps_surface_when_surface_inserted)
182	57	{	57	{
183	58	using namespace testing;	58	using namespace testing;
184	59	auto surface_called = false;
185	60	mcl::ConnectionSurfaceMap map;	59	mcl::ConnectionSurfaceMap map;
186	61	map.insert(surface_id, surface);	60	map.insert(surface_id, surface);
193	62	map.with_surface_do(surface_id, [&](MirSurface* surf) {	61	EXPECT_EQ(surface, map.surface(surface_id));
188	63	EXPECT_THAT(surf, Eq(surface.get()));
189	64	surface_called = true;
190	65	});
191	66
192	67	EXPECT_TRUE(surface_called);
194	68	}	62	}
195	69		63
196	70	TEST_F(ConnectionResourceMap, removes_surface_when_surface_removed)	64	TEST_F(ConnectionResourceMap, removes_surface_when_surface_removed)
197	@@ -73,22 +67,15 @@
198	73	mcl::ConnectionSurfaceMap map;	67	mcl::ConnectionSurfaceMap map;
199	74	map.insert(surface_id, surface);	68	map.insert(surface_id, surface);
200	75	map.erase(surface_id);	69	map.erase(surface_id);
204	76	EXPECT_THROW({	70	EXPECT_FALSE(map.stream(stream_id));
202	77	map.with_stream_do(stream_id, [](MirBufferStream*){});
203	78	}, std::runtime_error);
205	79	}	71	}
206	80		72
207	81	TEST_F(ConnectionResourceMap, maps_streams)	73	TEST_F(ConnectionResourceMap, maps_streams)
208	82	{	74	{
209	83	using namespace testing;	75	using namespace testing;
210	84	auto stream_called = false;
211	85	mcl::ConnectionSurfaceMap map;	76	mcl::ConnectionSurfaceMap map;
212	86	map.insert(stream_id, stream);	77	map.insert(stream_id, stream);
218	87	map.with_stream_do(stream_id, [&](MirBufferStream* str) {	78	EXPECT_EQ(stream, map.stream(stream_id));
214	88	EXPECT_THAT(str, Eq(stream.get()));
215	89	stream_called = true;
216	90	});
217	91	EXPECT_TRUE(stream_called);
219	92	map.erase(stream_id);	79	map.erase(stream_id);
220	93	}	80	}
221	94		81
222	@@ -126,11 +113,7 @@
223	126	mcl::ConnectionSurfaceMap map;	113	mcl::ConnectionSurfaceMap map;
224	127	map.insert(buffer_id, buffer);	114	map.insert(buffer_id, buffer);
225	128	map.insert(surface_id, surface);	115	map.insert(surface_id, surface);
231	129		116	EXPECT_EQ(buffer, map.buffer(buffer_id));
227	130	map.with_surface_do(surface_id,
228	131	[this, &map](auto) {
229	132	EXPECT_THAT(map.buffer(buffer_id), Eq(buffer));
230	133	});
232	134	}	117	}
233	135		118
234	136	TEST_F(ConnectionResourceMap, can_insert_retrieve_erase_render_surface)	119	TEST_F(ConnectionResourceMap, can_insert_retrieve_erase_render_surface)
235	137		120
236	=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
237	--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2016-12-02 05:05:06 +0000
238	+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2016-12-08 10:07:47 +0000
239	@@ -59,10 +59,8 @@
240	59		59
241	60	struct MockSurfaceMap : mcl::SurfaceMap	60	struct MockSurfaceMap : mcl::SurfaceMap
242	61	{	61	{
247	62	MOCK_CONST_METHOD2(with_surface_do,	62	MOCK_CONST_METHOD1(surface, std::shared_ptr<MirSurface>(mir::frontend::SurfaceId));
248	63	void(mir::frontend::SurfaceId, std::function<void(MirSurface*)> const&));	63	MOCK_CONST_METHOD1(stream, std::shared_ptr<MirBufferStream>(mir::frontend::BufferStreamId));
245	64	MOCK_CONST_METHOD2(with_stream_do,
246	65	void(mir::frontend::BufferStreamId, std::function<void(MirBufferStream*)> const&));
249	66	MOCK_CONST_METHOD1(with_all_streams_do,	64	MOCK_CONST_METHOD1(with_all_streams_do,
250	67	void(std::function<void(MirBufferStream*)> const&));	65	void(std::function<void(MirBufferStream*)> const&));
251	68	MOCK_CONST_METHOD1(buffer, std::shared_ptr<mcl::MirBuffer>(int));	66	MOCK_CONST_METHOD1(buffer, std::shared_ptr<mcl::MirBuffer>(int));
252	@@ -74,13 +72,13 @@
253	74	class StubSurfaceMap : public mcl::SurfaceMap	72	class StubSurfaceMap : public mcl::SurfaceMap
254	75	{	73	{
255	76	public:	74	public:
258	77	void with_surface_do(	75	std::shared_ptr<MirSurface> surface(mir::frontend::SurfaceId) const override
257	78	mir::frontend::SurfaceId, std::function<void(MirSurface*)> const&) const override
259	79	{	76	{
260			77	return {};
261	80	}	78	}
264	81	void with_stream_do(	79	std::shared_ptr<MirBufferStream> stream(mir::frontend::BufferStreamId) const override
263	82	mir::frontend::BufferStreamId, std::function<void(MirBufferStream*)> const&) const override
265	83	{	80	{
266			81	return {};
267	84	}	82	}
268	85	void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override	83	void with_all_streams_do(std::function<void(MirBufferStream*)> const&) const override
269	86	{	84	{
270	@@ -796,7 +794,7 @@
271	796	auto mock_buffer_factory = std::make_shared<MockBufferFactory>();	794	auto mock_buffer_factory = std::make_shared<MockBufferFactory>();
272	797	auto mock_client_buffer = std::make_shared<mtd::MockClientBuffer>();	795	auto mock_client_buffer = std::make_shared<mtd::MockClientBuffer>();
273	798	auto buf = std::make_shared<mcl::Buffer>(buffer_cb, nullptr, buffer_id, mock_client_buffer, nullptr, mir_buffer_usage_software);	796	auto buf = std::make_shared<mcl::Buffer>(buffer_cb, nullptr, buffer_id, mock_client_buffer, nullptr, mir_buffer_usage_software);
275	799	EXPECT_CALL(*stream_map, with_stream_do(mir::frontend::BufferStreamId{stream_id},_))	797	EXPECT_CALL(*stream_map, stream(mir::frontend::BufferStreamId{stream_id}))
276	800	.Times(1);	798	.Times(1);
277	801		799
278	802	auto transport = std::make_unique<NiceMock<MockStreamTransport>>();	800	auto transport = std::make_unique<NiceMock<MockStreamTransport>>();