1
=== modified file 'src/client/connection_surface_map.h'
2
--- src/client/connection_surface_map.h	2015-07-16 07:03:19 +0000
3
+++ src/client/connection_surface_map.h	2015-12-15 15:42:58 +0000
4
@@ -21,8 +21,8 @@
5
21
21
6
22
#include "surface_map.h"
22
#include "surface_map.h"
7
23
23
8
24
#include <shared_mutex>
9
24
#include <unordered_map>
25
#include <unordered_map>
10
25
#include <mutex>
11
26
26
12
27
namespace mir
27
namespace mir
13
28
{
28
{
14
@@ -49,7 +49,7 @@
15
49
    void erase(frontend::BufferStreamId surface_id);
49
    void erase(frontend::BufferStreamId surface_id);
16
50
50
17
51
private:
51
private:
19
52
    std::mutex mutable guard;
52
    std::shared_timed_mutex mutable guard;
20
53
    std::unordered_map<frontend::SurfaceId, MirSurface*> surfaces;
53
    std::unordered_map<frontend::SurfaceId, MirSurface*> surfaces;
21
54
    std::unordered_map<frontend::BufferStreamId, StreamInfo> streams;
54
    std::unordered_map<frontend::BufferStreamId, StreamInfo> streams;
22
55
};
55
};
23
56
56
24
=== modified file 'src/client/rpc/mir_basic_rpc_channel.cpp'
25
--- src/client/rpc/mir_basic_rpc_channel.cpp	2015-08-21 12:08:03 +0000
26
+++ src/client/rpc/mir_basic_rpc_channel.cpp	2015-12-15 15:42:58 +0000
27
@@ -66,10 +66,12 @@
28
66
    pending_calls[invoke.id()] = PendingCall(response, complete);
66
    pending_calls[invoke.id()] = PendingCall(response, complete);
29
67
}
67
}
30
68
68
32
69
google::protobuf::MessageLite* mclrd::PendingCallCache::message_for_result(mir::protobuf::wire::Result& result)
69
void mclrd::PendingCallCache::populate_message_for_result(
33
70
    mir::protobuf::wire::Result& result,
34
71
    std::function<void(google::protobuf::MessageLite*)> const& populator)
35
70
{
72
{
36
71
    std::unique_lock<std::mutex> lock(mutex);
73
    std::unique_lock<std::mutex> lock(mutex);
38
72
    return pending_calls.at(result.id()).response;
74
    populator(pending_calls.at(result.id()).response);
39
73
}
75
}
40
74
76
41
75
void mclrd::PendingCallCache::complete_response(mir::protobuf::wire::Result& result)
77
void mclrd::PendingCallCache::complete_response(mir::protobuf::wire::Result& result)
42
76
78
43
=== modified file 'src/client/rpc/mir_basic_rpc_channel.h'
44
--- src/client/rpc/mir_basic_rpc_channel.h	2015-08-21 12:08:03 +0000
45
+++ src/client/rpc/mir_basic_rpc_channel.h	2015-12-15 15:42:58 +0000
46
@@ -67,7 +67,9 @@
47
67
        google::protobuf::Closure* complete);
67
        google::protobuf::Closure* complete);
48
68
68
49
69
69
51
70
    google::protobuf::MessageLite* message_for_result(mir::protobuf::wire::Result& result);
70
    void populate_message_for_result(
52
71
        mir::protobuf::wire::Result& result,
53
72
        std::function<void(google::protobuf::MessageLite*)> const& populator);
54
71
73
55
72
    void complete_response(mir::protobuf::wire::Result& result);
74
    void complete_response(mir::protobuf::wire::Result& result);
56
73
75
57
74
76
58
=== modified file 'src/client/rpc/mir_protobuf_rpc_channel.cpp'
59
--- src/client/rpc/mir_protobuf_rpc_channel.cpp	2015-10-07 12:07:00 +0000
60
+++ src/client/rpc/mir_protobuf_rpc_channel.cpp	2015-12-15 15:42:58 +0000
61
@@ -382,9 +382,13 @@
62
382
382
63
383
        if (result->has_id())
383
        if (result->has_id())
64
384
        {
384
        {
68
385
            auto result_message = pending_calls.message_for_result(*result);
385
            pending_calls.populate_message_for_result(
69
386
            result_message->ParseFromString(result->response());
386
                *result,
70
387
            receive_file_descriptors(result_message);
387
                [&](google::protobuf::MessageLite* result_message)
71
388
                    {
72
389
                        result_message->ParseFromString(result->response());
73
390
                        receive_file_descriptors(result_message);
74
391
                    });
75
388
392
76
389
            if (id_to_wait_for)
393
            if (id_to_wait_for)
77
390
            {
394
            {
78
391
395
79
=== modified file 'src/client/surface_map.cpp'
80
--- src/client/surface_map.cpp	2015-07-27 07:24:50 +0000
81
+++ src/client/surface_map.cpp	2015-12-15 15:42:58 +0000
82
@@ -37,7 +37,7 @@
83
37
        //Prevent TSAN from flagging lock ordering issues
37
        //Prevent TSAN from flagging lock ordering issues
84
38
        //as the surface/buffer_stream destructors acquire internal locks
38
        //as the surface/buffer_stream destructors acquire internal locks
85
39
        //The mutex lock is used mainly as a memory barrier here
39
        //The mutex lock is used mainly as a memory barrier here
87
40
        std::lock_guard<std::mutex> lk(guard);
40
        std::lock_guard<decltype(guard)> lk(guard);
88
41
        surface_map = std::move(surfaces);
41
        surface_map = std::move(surfaces);
89
42
        stream_map = std::move(streams);
42
        stream_map = std::move(streams);
90
43
    }
43
    }
91
@@ -60,12 +60,11 @@
92
60
void mcl::ConnectionSurfaceMap::with_surface_do(
60
void mcl::ConnectionSurfaceMap::with_surface_do(
93
61
    mf::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const
61
    mf::SurfaceId surface_id, std::function<void(MirSurface*)> const& exec) const
94
62
{
62
{
96
63
    std::unique_lock<std::mutex> lk(guard);
63
    std::shared_lock<decltype(guard)> lk(guard);
97
64
    auto const it = surfaces.find(surface_id);
64
    auto const it = surfaces.find(surface_id);
98
65
    if (it != surfaces.end())
65
    if (it != surfaces.end())
99
66
    {
66
    {
100
67
        auto const surface = it->second;
67
        auto const surface = it->second;
101
68
        lk.unlock();
102
69
        exec(surface);
68
        exec(surface);
103
70
    }
69
    }
104
71
    else
70
    else
105
@@ -81,14 +80,14 @@
106
81
    // get_buffer_stream has internal locks - call before locking mutex to
80
    // get_buffer_stream has internal locks - call before locking mutex to
107
82
    // avoid locking ordering issues
81
    // avoid locking ordering issues
108
83
    auto const stream = surface->get_buffer_stream();
82
    auto const stream = surface->get_buffer_stream();
110
84
    std::lock_guard<std::mutex> lk(guard);
83
    std::lock_guard<decltype(guard)> lk(guard);
111
85
    surfaces[surface_id] = surface;
84
    surfaces[surface_id] = surface;
112
86
    streams[mf::BufferStreamId(surface_id.as_value())] = {stream, false};
85
    streams[mf::BufferStreamId(surface_id.as_value())] = {stream, false};
113
87
}
86
}
114
88
87
115
89
void mcl::ConnectionSurfaceMap::erase(mf::SurfaceId surface_id)
88
void mcl::ConnectionSurfaceMap::erase(mf::SurfaceId surface_id)
116
90
{
89
{
118
91
    std::lock_guard<std::mutex> lk(guard);
90
    std::lock_guard<decltype(guard)> lk(guard);
119
92
    surfaces.erase(surface_id);
91
    surfaces.erase(surface_id);
120
93
    streams.erase(mf::BufferStreamId(surface_id.as_value()));
92
    streams.erase(mf::BufferStreamId(surface_id.as_value()));
121
94
}
93
}
122
@@ -96,12 +95,11 @@
123
96
void mcl::ConnectionSurfaceMap::with_stream_do(
95
void mcl::ConnectionSurfaceMap::with_stream_do(
124
97
    mf::BufferStreamId stream_id, std::function<void(ClientBufferStream*)> const& exec) const
96
    mf::BufferStreamId stream_id, std::function<void(ClientBufferStream*)> const& exec) const
125
98
{
97
{
127
99
    std::unique_lock<std::mutex> lk(guard);
98
    std::shared_lock<decltype(guard)> lk(guard);
128
100
    auto const it = streams.find(stream_id);
99
    auto const it = streams.find(stream_id);
129
101
    if (it != streams.end())
100
    if (it != streams.end())
130
102
    {
101
    {
131
103
        auto const stream = it->second.stream;
102
        auto const stream = it->second.stream;
132
104
        lk.unlock();
133
105
        exec(stream);
103
        exec(stream);
134
106
    }
104
    }
135
107
    else
105
    else
136
@@ -114,19 +112,19 @@
137
114
112
138
115
void mcl::ConnectionSurfaceMap::with_all_streams_do(std::function<void(ClientBufferStream*)> const& fn) const
113
void mcl::ConnectionSurfaceMap::with_all_streams_do(std::function<void(ClientBufferStream*)> const& fn) const
139
116
{
114
{
141
117
    std::unique_lock<std::mutex> lk(guard);
115
    std::shared_lock<decltype(guard)> lk(guard);
142
118
    for(auto const& stream : streams)
116
    for(auto const& stream : streams)
143
119
        fn(stream.second.stream);
117
        fn(stream.second.stream);
144
120
}
118
}
145
121
119
146
122
void mcl::ConnectionSurfaceMap::insert(mf::BufferStreamId stream_id, ClientBufferStream* stream)
120
void mcl::ConnectionSurfaceMap::insert(mf::BufferStreamId stream_id, ClientBufferStream* stream)
147
123
{
121
{
149
124
    std::lock_guard<std::mutex> lk(guard);
122
    std::lock_guard<decltype(guard)> lk(guard);
150
125
    streams[stream_id] = {stream, true};
123
    streams[stream_id] = {stream, true};
151
126
}
124
}
152
127
125
153
128
void mcl::ConnectionSurfaceMap::erase(mf::BufferStreamId stream_id)
126
void mcl::ConnectionSurfaceMap::erase(mf::BufferStreamId stream_id)
154
129
{
127
{
156
130
    std::lock_guard<std::mutex> lk(guard);
128
    std::lock_guard<decltype(guard)> lk(guard);
157
131
    streams.erase(stream_id);
129
    streams.erase(stream_id);
158
132
}
130
}
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Abstain on 2015-12-17
Alberto Aguirre (community)			Approve on 2015-12-16
PS Jenkins bot (community)	continuous-integration		Approve on 2015-12-15
Kevin DuBois (community)		2015-12-15	Approve on 2015-12-15
Review via email: mp+280578@code.launchpad.net