Mir

Merge lp:~afrantzis/mir/eradicate-drm-auth-magic-rpc into lp:mir

  1. eradicate-drm-auth-magic-rpc
  2. Merge into development-branch
Proposed by Alexandros Frantzis on 2015-09-18
Status: Merged
Approved by: Daniel van Vugt on 2015-09-21
Approved revision: 2946
Merged at revision: 2951
Proposed branch: lp:~afrantzis/mir/eradicate-drm-auth-magic-rpc
Merge into: lp:mir
Diff against target: 819 lines (+23/-272)
33 files modified
debian/control (+3/-3)
debian/libmirprotobuf4.install (+1/-1)
debian/libmirserver35.install (+1/-1)
include/server/mir/frontend/session_mediator_report.h (+0/-2)
src/client/rpc/mir_display_server.cpp (+0/-7)
src/client/rpc/mir_display_server.h (+0/-4)
src/include/common/mir/protobuf/display_server.h (+0/-4)
src/protobuf/CMakeLists.txt (+1/-1)
src/protobuf/mir_protobuf.proto (+0/-10)
src/protobuf/symbols.map (+1/-41)
src/server/CMakeLists.txt (+1/-1)
src/server/frontend/protobuf_message_processor.cpp (+0/-4)
src/server/frontend/session_mediator.cpp (+0/-35)
src/server/frontend/session_mediator.h (+0/-4)
src/server/report/logging/session_mediator_report.cpp (+0/-5)
src/server/report/logging/session_mediator_report.h (+0/-2)
src/server/report/lttng/session_mediator_report.cpp (+0/-1)
src/server/report/lttng/session_mediator_report.h (+0/-1)
src/server/report/lttng/session_mediator_report_tp.h (+0/-1)
src/server/report/null/session_mediator_report.cpp (+0/-4)
src/server/report/null/session_mediator_report.h (+0/-2)
src/server/symbols.map (+1/-1)
tests/acceptance-tests/test_nested_mir.cpp (+0/-1)
tests/acceptance-tests/test_session_mediator_report.cpp (+0/-1)
tests/include/mir/test/doubles/mock_nested_context.h (+0/-1)
tests/include/mir/test/doubles/stub_display_server.h (+0/-4)
tests/include/mir/test/stub_server_tool.h (+0/-18)
tests/include/mir/test/test_protobuf_client.h (+0/-6)
tests/mir_test_doubles/test_protobuf_client.cpp (+0/-18)
tests/unit-tests/client/test_protobuf_rpc_channel.cpp (+14/-14)
tests/unit-tests/frontend/stress_protobuf_communicator.cpp (+0/-19)
tests/unit-tests/frontend/test_published_socket_connector.cpp (+0/-18)
tests/unit-tests/frontend/test_session_mediator.cpp (+0/-37)
To merge this branch: bzr merge lp:~afrantzis/mir/eradicate-drm-auth-magic-rpc
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve on 2015-09-21
Chris Halse Rogers Approve on 2015-09-21
PS Jenkins bot continuous-integration Approve on 2015-09-18
Kevin DuBois (community) Approve on 2015-09-18
Alan Griffiths 2015-09-18 Approve on 2015-09-18
Review via email: mp+271667@code.launchpad.net

Commit Message

Eradicate the drm_auth_magic RPC call

Description of the Change

Eradicate the drm_auth_magic RPC call

This MP bumps the server ABI (34->35) since we removed a virtual function from the public SessionMediatorReport abstract calss.

Thes MP also bumps the ABI of the mirprotobuf library (3->4) since we removed the DRM related protobuf types. Note that it also updates the stanza in the mirprotobuf symbol file to track the ABI version (was there a reason it was stuck at MIR_PROTOBUF_1?).

There have been discussions in the past about including the mir version in the symbol stanza names (e.g. 35v0.15 or similar). I am not aware of a final decision, so if one has been made let me know so that I can update the stanza names accordingly.

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

I think the final decision was 35 - only adding v17 when adding a second stanza (and not bumping the soname).

Glad to see pong() is useful

review: Approve
Kevin DuBois (kdub) wrote :

lgtm, next_buffer() is another good candidate for removal... its been dead a few releases now

Kevin DuBois (kdub) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2946
http://jenkins.qa.ubuntu.com/job/mir-ci/4961/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4049
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2956
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1111
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3992
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3992/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6700
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23484

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4961/rebuild

review: Approve (continuous-integration)
Daniel van Vugt (vanvugt) wrote :

I like the idea. Just concerned a bit:

In Mir 0.16 we're introducing a protocol break that's slightly annoying. Wouldn't this proposal cause another protocol break in 0.17? Or does it only affect things that will be rebuilt anyway?

P.S. I will be probably voting to avoid ABI names like "5v0.17" etc. That's ugly and we can probably do better, but a discussion for elsewhere.

review: Needs Information
Chris Halse Rogers (raof) wrote :

LGTM

review: Approve
Alexandros Frantzis (afrantzis) wrote :

> In Mir 0.16 we're introducing a protocol break that's slightly annoying.
> Wouldn't this proposal cause another protocol break in 0.17? Or does it only
> affect things that will be rebuilt anyway?

No one is using the DRM specific protobuf requests anymore. The client side API was deprecated and removed long ago. So, although I had to bump mirprotobuf ABI since I am removing a class, in practice no program will be affected.

Daniel van Vugt (vanvugt) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-09-18 10:23:57 +0000
3+++ debian/control 2015-09-18 14:52:34 +0000
4@@ -50,7 +50,7 @@
5 # just go ahead. ~mir-team will notice and sync up the code again.
6 Vcs-Bzr: https://code.launchpad.net/mir
7
8-Package: libmirprotobuf3
9+Package: libmirprotobuf4
10 Section: libs
11 Architecture: linux-any
12 Multi-Arch: same
13@@ -66,7 +66,7 @@
14
15 #TODO: Packaging infrastructure for better dependency generation,
16 # ala pkg-xorg's xviddriver:Provides and ABI detection.
17-Package: libmirserver34
18+Package: libmirserver35
19 Section: libs
20 Architecture: linux-any
21 Multi-Arch: same
22@@ -132,7 +132,7 @@
23 Architecture: linux-any
24 Multi-Arch: same
25 Pre-Depends: ${misc:Pre-Depends}
26-Depends: libmirserver34 (= ${binary:Version}),
27+Depends: libmirserver35 (= ${binary:Version}),
28 libmirplatform-dev (= ${binary:Version}),
29 libmircommon-dev (= ${binary:Version}),
30 libglm-dev,
31
32=== renamed file 'debian/libmirprotobuf3.install' => 'debian/libmirprotobuf4.install'
33--- debian/libmirprotobuf3.install 2015-09-11 20:08:20 +0000
34+++ debian/libmirprotobuf4.install 2015-09-18 14:52:34 +0000
35@@ -1,1 +1,1 @@
36-usr/lib/*/libmirprotobuf.so.3
37+usr/lib/*/libmirprotobuf.so.4
38
39=== renamed file 'debian/libmirserver34.install' => 'debian/libmirserver35.install'
40--- debian/libmirserver34.install 2015-09-07 11:54:56 +0000
41+++ debian/libmirserver35.install 2015-09-18 14:52:34 +0000
42@@ -1,1 +1,1 @@
43-usr/lib/*/libmirserver.so.34
44+usr/lib/*/libmirserver.so.35
45
46=== modified file 'include/server/mir/frontend/session_mediator_report.h'
47--- include/server/mir/frontend/session_mediator_report.h 2015-08-14 16:11:47 +0000
48+++ include/server/mir/frontend/session_mediator_report.h 2015-09-18 14:52:34 +0000
49@@ -52,8 +52,6 @@
50
51 virtual void session_disconnect_called(std::string const& app_name) = 0;
52
53- virtual void session_drm_auth_magic_called(std::string const& app_name) = 0;
54-
55 virtual void session_configure_surface_called(std::string const& app_name) = 0;
56
57 virtual void session_configure_surface_cursor_called(std::string const& app_name) = 0;
58
59=== modified file 'src/client/rpc/mir_display_server.cpp'
60--- src/client/rpc/mir_display_server.cpp 2015-09-11 18:40:04 +0000
61+++ src/client/rpc/mir_display_server.cpp 2015-09-18 14:52:34 +0000
62@@ -70,13 +70,6 @@
63 {
64 channel->call_method(std::string(__func__), request, response, done);
65 }
66-void mclr::DisplayServer::drm_auth_magic(
67- mir::protobuf::DRMMagic const* request,
68- mir::protobuf::DRMAuthMagicStatus* response,
69- google::protobuf::Closure* done)
70-{
71- channel->call_method(std::string(__func__), request, response, done);
72-}
73 void mclr::DisplayServer::platform_operation(
74 mir::protobuf::PlatformOperationMessage const* request,
75 mir::protobuf::PlatformOperationMessage* response,
76
77=== modified file 'src/client/rpc/mir_display_server.h'
78--- src/client/rpc/mir_display_server.h 2015-09-11 18:40:04 +0000
79+++ src/client/rpc/mir_display_server.h 2015-09-18 14:52:34 +0000
80@@ -59,10 +59,6 @@
81 mir::protobuf::SurfaceId const* request,
82 mir::protobuf::Void* response,
83 google::protobuf::Closure* done) override;
84- void drm_auth_magic(
85- mir::protobuf::DRMMagic const* request,
86- mir::protobuf::DRMAuthMagicStatus* response,
87- google::protobuf::Closure* done) override;
88 void platform_operation(
89 mir::protobuf::PlatformOperationMessage const* request,
90 mir::protobuf::PlatformOperationMessage* response,
91
92=== modified file 'src/include/common/mir/protobuf/display_server.h'
93--- src/include/common/mir/protobuf/display_server.h 2015-09-11 18:40:04 +0000
94+++ src/include/common/mir/protobuf/display_server.h 2015-09-18 14:52:34 +0000
95@@ -55,10 +55,6 @@
96 mir::protobuf::SurfaceId const* request,
97 mir::protobuf::Void* response,
98 google::protobuf::Closure* done) = 0;
99- virtual void drm_auth_magic(
100- mir::protobuf::DRMMagic const* request,
101- mir::protobuf::DRMAuthMagicStatus* response,
102- google::protobuf::Closure* done) = 0;
103 virtual void platform_operation(
104 mir::protobuf::PlatformOperationMessage const* request,
105 mir::protobuf::PlatformOperationMessage* response,
106
107=== modified file 'src/protobuf/CMakeLists.txt'
108--- src/protobuf/CMakeLists.txt 2015-09-11 19:24:25 +0000
109+++ src/protobuf/CMakeLists.txt 2015-09-18 14:52:34 +0000
110@@ -24,7 +24,7 @@
111 ${PROTOBUF_LITE_LIBRARIES}
112 )
113
114-set(MIRPROTOBUF_ABI 3)
115+set(MIRPROTOBUF_ABI 4)
116
117 set(symbol_map ${CMAKE_SOURCE_DIR}/src/protobuf/symbols.map)
118
119
120=== modified file 'src/protobuf/mir_protobuf.proto'
121--- src/protobuf/mir_protobuf.proto 2015-09-11 18:15:43 +0000
122+++ src/protobuf/mir_protobuf.proto 2015-09-18 14:52:34 +0000
123@@ -215,16 +215,6 @@
124 optional string error = 127;
125 }
126
127-message DRMMagic {
128- optional uint32 magic = 1;
129- optional string error = 127;
130-}
131-
132-message DRMAuthMagicStatus {
133- optional int32 status_code = 1;
134- optional string error = 127;
135-}
136-
137 message Void {
138 optional string error = 127;
139 }
140
141=== modified file 'src/protobuf/symbols.map'
142--- src/protobuf/symbols.map 2015-07-28 23:05:14 +0000
143+++ src/protobuf/symbols.map 2015-09-18 14:52:34 +0000
144@@ -1,4 +1,4 @@
145-MIR_PROTOBUF_1 {
146+MIR_PROTOBUF_4 {
147 global:
148 extern "C++" {
149 mir::protobuf::BufferAllocation::?BufferAllocation*;
150@@ -306,40 +306,6 @@
151 mir::protobuf::DisplayOutput::New*;
152 mir::protobuf::DisplayOutput::SerializeWithCachedSizes*;
153 mir::protobuf::DisplayOutput::Swap*;
154- mir::protobuf::DRMAuthMagicStatus::ByteSize*;
155- mir::protobuf::DRMAuthMagicStatus::CheckTypeAndMergeFrom*;
156- mir::protobuf::DRMAuthMagicStatus::Clear*;
157- mir::protobuf::DRMAuthMagicStatus::CopyFrom*;
158- mir::protobuf::DRMAuthMagicStatus::default_instance*;
159- mir::protobuf::DRMAuthMagicStatus::DiscardUnknownFields*;
160- mir::protobuf::DRMAuthMagicStatus::?DRMAuthMagicStatus*;
161- mir::protobuf::DRMAuthMagicStatus::DRMAuthMagicStatus*;
162- mir::protobuf::DRMAuthMagicStatus::GetTypeName*;
163- mir::protobuf::DRMAuthMagicStatus::IsInitialized*;
164- mir::protobuf::DRMAuthMagicStatus::kErrorFieldNumber*;
165- mir::protobuf::DRMAuthMagicStatus::kStatusCodeFieldNumber*;
166- mir::protobuf::DRMAuthMagicStatus::MergeFrom*;
167- mir::protobuf::DRMAuthMagicStatus::MergePartialFromCodedStream*;
168- mir::protobuf::DRMAuthMagicStatus::New*;
169- mir::protobuf::DRMAuthMagicStatus::SerializeWithCachedSizes*;
170- mir::protobuf::DRMAuthMagicStatus::Swap*;
171- mir::protobuf::DRMMagic::ByteSize*;
172- mir::protobuf::DRMMagic::CheckTypeAndMergeFrom*;
173- mir::protobuf::DRMMagic::Clear*;
174- mir::protobuf::DRMMagic::CopyFrom*;
175- mir::protobuf::DRMMagic::default_instance*;
176- mir::protobuf::DRMMagic::DiscardUnknownFields*;
177- mir::protobuf::DRMMagic::?DRMMagic*;
178- mir::protobuf::DRMMagic::DRMMagic*;
179- mir::protobuf::DRMMagic::GetTypeName*;
180- mir::protobuf::DRMMagic::IsInitialized*;
181- mir::protobuf::DRMMagic::kErrorFieldNumber*;
182- mir::protobuf::DRMMagic::kMagicFieldNumber*;
183- mir::protobuf::DRMMagic::MergeFrom*;
184- mir::protobuf::DRMMagic::MergePartialFromCodedStream*;
185- mir::protobuf::DRMMagic::New*;
186- mir::protobuf::DRMMagic::SerializeWithCachedSizes*;
187- mir::protobuf::DRMMagic::Swap*;
188 mir::protobuf::Event::ByteSize*;
189 mir::protobuf::Event::CheckTypeAndMergeFrom*;
190 mir::protobuf::Event::Clear*;
191@@ -855,8 +821,6 @@
192 non-virtual?thunk?to?mir::protobuf::DisplayConfiguration::?DisplayConfiguration*;
193 non-virtual?thunk?to?mir::protobuf::DisplayMode::?DisplayMode*;
194 non-virtual?thunk?to?mir::protobuf::DisplayOutput::?DisplayOutput*;
195- non-virtual?thunk?to?mir::protobuf::DRMAuthMagicStatus::?DRMAuthMagicStatus*;
196- non-virtual?thunk?to?mir::protobuf::DRMMagic::?DRMMagic*;
197 non-virtual?thunk?to?mir::protobuf::Event::?Event*;
198 non-virtual?thunk?to?mir::protobuf::EventSequence::?EventSequence*;
199 non-virtual?thunk?to?mir::protobuf::LifecycleEvent::?LifecycleEvent*;
200@@ -898,8 +862,6 @@
201 typeinfo?for?mir::protobuf::DisplayConfiguration;
202 typeinfo?for?mir::protobuf::DisplayMode;
203 typeinfo?for?mir::protobuf::DisplayOutput;
204- typeinfo?for?mir::protobuf::DRMAuthMagicStatus;
205- typeinfo?for?mir::protobuf::DRMMagic;
206 typeinfo?for?mir::protobuf::Event;
207 typeinfo?for?mir::protobuf::EventSequence;
208 typeinfo?for?mir::protobuf::LifecycleEvent;
209@@ -943,8 +905,6 @@
210 vtable?for?mir::protobuf::DisplayConfiguration;
211 vtable?for?mir::protobuf::DisplayMode;
212 vtable?for?mir::protobuf::DisplayOutput;
213- vtable?for?mir::protobuf::DRMAuthMagicStatus;
214- vtable?for?mir::protobuf::DRMMagic;
215 vtable?for?mir::protobuf::Event;
216 vtable?for?mir::protobuf::EventSequence;
217 vtable?for?mir::protobuf::LifecycleEvent;
218
219=== modified file 'src/server/CMakeLists.txt'
220--- src/server/CMakeLists.txt 2015-09-10 20:12:04 +0000
221+++ src/server/CMakeLists.txt 2015-09-18 14:52:34 +0000
222@@ -118,7 +118,7 @@
223 ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
224 )
225
226-set(MIRSERVER_ABI 34) # Be sure to increment MIR_VERSION_MINOR at the same time
227+set(MIRSERVER_ABI 35) # Be sure to increment MIR_VERSION_MINOR at the same time
228 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
229
230 set_target_properties(
231
232=== modified file 'src/server/frontend/protobuf_message_processor.cpp'
233--- src/server/frontend/protobuf_message_processor.cpp 2015-09-11 18:15:43 +0000
234+++ src/server/frontend/protobuf_message_processor.cpp 2015-09-18 14:52:34 +0000
235@@ -234,10 +234,6 @@
236 {
237 invoke(this, display_server.get(), &DisplayServer::release_surface, invocation);
238 }
239- else if ("drm_auth_magic" == invocation.method_name())
240- {
241- invoke(this, display_server.get(), &DisplayServer::drm_auth_magic, invocation);
242- }
243 else if ("platform_operation" == invocation.method_name())
244 {
245 auto request = parse_parameter<mir::protobuf::PlatformOperationMessage>(invocation);
246
247=== modified file 'src/server/frontend/session_mediator.cpp'
248--- src/server/frontend/session_mediator.cpp 2015-09-16 11:29:08 +0000
249+++ src/server/frontend/session_mediator.cpp 2015-09-18 14:52:34 +0000
250@@ -47,11 +47,6 @@
251 #include "mir/scene/prompt_session_creation_parameters.h"
252 #include "mir/fd.h"
253
254-// Temporary include to ease client transition from mir_connection_drm* APIs
255-// to mir_connection_platform_operation().
256-// TODO: Remove when transition is complete
257-#include "../../../include/platforms/mesa/mir_toolkit/mesa/platform_operation.h"
258-
259 #include "mir/geometry/rectangles.h"
260 #include "buffer_stream_tracker.h"
261 #include "client_buffer_tracker.h"
262@@ -872,36 +867,6 @@
263 done->Run();
264 }
265
266-void mf::SessionMediator::drm_auth_magic(
267- const mir::protobuf::DRMMagic* request,
268- mir::protobuf::DRMAuthMagicStatus* response,
269- google::protobuf::Closure* done)
270-{
271- auto session = weak_session.lock();
272-
273- if (session.get() == nullptr)
274- BOOST_THROW_EXCEPTION(std::logic_error("Invalid application session"));
275-
276- report->session_drm_auth_magic_called(session->name());
277-
278- auto const magic = request->magic();
279-
280- MirMesaAuthMagicRequest const auth_magic_request{magic};
281- mg::PlatformOperationMessage platform_request;
282- platform_request.data.resize(sizeof(auth_magic_request));
283- std::memcpy(platform_request.data.data(), &auth_magic_request, sizeof(auth_magic_request));
284-
285- auto const platform_response = ipc_operations->platform_operation(
286- MirMesaPlatformOperation::auth_magic, platform_request);
287-
288- MirMesaAuthMagicResponse auth_magic_response{-1};
289- std::memcpy(&auth_magic_response, platform_response.data.data(),
290- platform_response.data.size());
291- response->set_status_code(auth_magic_response.status);
292-
293- done->Run();
294-}
295-
296 void mf::SessionMediator::platform_operation(
297 mir::protobuf::PlatformOperationMessage const* request,
298 mir::protobuf::PlatformOperationMessage* response,
299
300=== modified file 'src/server/frontend/session_mediator.h'
301--- src/server/frontend/session_mediator.h 2015-09-11 18:40:04 +0000
302+++ src/server/frontend/session_mediator.h 2015-09-18 14:52:34 +0000
303@@ -124,10 +124,6 @@
304 mir::protobuf::SurfaceId const* request,
305 mir::protobuf::Void* response,
306 google::protobuf::Closure* done) override;
307- void drm_auth_magic(
308- mir::protobuf::DRMMagic const* request,
309- mir::protobuf::DRMAuthMagicStatus* response,
310- google::protobuf::Closure* done) override;
311 void platform_operation(
312 mir::protobuf::PlatformOperationMessage const* request,
313 mir::protobuf::PlatformOperationMessage* response,
314
315=== modified file 'src/server/report/logging/session_mediator_report.cpp'
316--- src/server/report/logging/session_mediator_report.cpp 2015-07-16 07:03:19 +0000
317+++ src/server/report/logging/session_mediator_report.cpp 2015-09-18 14:52:34 +0000
318@@ -78,11 +78,6 @@
319 log->log(ml::Severity::informational, "session_disconnect_called(\"" + app_name + "\")", component);
320 }
321
322-void mrl::SessionMediatorReport::session_drm_auth_magic_called(std::string const& app_name)
323-{
324- log->log(ml::Severity::informational, "session_drm_auth_magic_called(\"" + app_name + "\")", component);
325-}
326-
327 void mrl::SessionMediatorReport::session_configure_surface_called(std::string const& app_name)
328 {
329 log->log(ml::Severity::informational, "session_configure_surface_called(\"" + app_name + "\")", component);
330
331=== modified file 'src/server/report/logging/session_mediator_report.h'
332--- src/server/report/logging/session_mediator_report.h 2015-07-16 07:03:19 +0000
333+++ src/server/report/logging/session_mediator_report.h 2015-09-18 14:52:34 +0000
334@@ -59,8 +59,6 @@
335
336 virtual void session_disconnect_called(std::string const& app_name);
337
338- virtual void session_drm_auth_magic_called(std::string const& app_name);
339-
340 virtual void session_configure_surface_called(std::string const& app_name);
341
342 virtual void session_configure_surface_cursor_called(std::string const& app_name);
343
344=== modified file 'src/server/report/lttng/session_mediator_report.cpp'
345--- src/server/report/lttng/session_mediator_report.cpp 2015-07-16 07:03:19 +0000
346+++ src/server/report/lttng/session_mediator_report.cpp 2015-09-18 14:52:34 +0000
347@@ -39,7 +39,6 @@
348 MIR_SESSION_MEDIATOR_EVENT_METHOD(session_release_buffers_called)
349 MIR_SESSION_MEDIATOR_EVENT_METHOD(session_release_surface_called)
350 MIR_SESSION_MEDIATOR_EVENT_METHOD(session_disconnect_called)
351-MIR_SESSION_MEDIATOR_EVENT_METHOD(session_drm_auth_magic_called)
352 MIR_SESSION_MEDIATOR_EVENT_METHOD(session_configure_surface_called)
353 MIR_SESSION_MEDIATOR_EVENT_METHOD(session_configure_surface_cursor_called)
354 MIR_SESSION_MEDIATOR_EVENT_METHOD(session_configure_display_called)
355
356=== modified file 'src/server/report/lttng/session_mediator_report.h'
357--- src/server/report/lttng/session_mediator_report.h 2015-07-16 07:03:19 +0000
358+++ src/server/report/lttng/session_mediator_report.h 2015-09-18 14:52:34 +0000
359@@ -42,7 +42,6 @@
360 void session_release_buffers_called(std::string const& app_name) override;
361 void session_release_surface_called(std::string const& app_name) override;
362 void session_disconnect_called(std::string const& app_name) override;
363- void session_drm_auth_magic_called(std::string const& app_name) override;
364 void session_configure_surface_called(std::string const& app_name) override;
365 void session_configure_surface_cursor_called(std::string const& app_name) override;
366 void session_configure_display_called(std::string const& app_name) override;
367
368=== modified file 'src/server/report/lttng/session_mediator_report_tp.h'
369--- src/server/report/lttng/session_mediator_report_tp.h 2015-07-16 07:03:19 +0000
370+++ src/server/report/lttng/session_mediator_report_tp.h 2015-09-18 14:52:34 +0000
371@@ -48,7 +48,6 @@
372 MIR_SESSION_MEDIATOR_EVENT(session_release_buffers_called)
373 MIR_SESSION_MEDIATOR_EVENT(session_release_surface_called)
374 MIR_SESSION_MEDIATOR_EVENT(session_disconnect_called)
375-MIR_SESSION_MEDIATOR_EVENT(session_drm_auth_magic_called)
376 MIR_SESSION_MEDIATOR_EVENT(session_configure_surface_called)
377 MIR_SESSION_MEDIATOR_EVENT(session_configure_surface_cursor_called)
378 MIR_SESSION_MEDIATOR_EVENT(session_configure_display_called)
379
380=== modified file 'src/server/report/null/session_mediator_report.cpp'
381--- src/server/report/null/session_mediator_report.cpp 2015-07-16 07:03:19 +0000
382+++ src/server/report/null/session_mediator_report.cpp 2015-09-18 14:52:34 +0000
383@@ -54,10 +54,6 @@
384 {
385 }
386
387-void mir::report::null::SessionMediatorReport::session_drm_auth_magic_called(std::string const&)
388-{
389-}
390-
391 void mir::report::null::SessionMediatorReport::session_configure_surface_called(std::string const&)
392 {
393 }
394
395=== modified file 'src/server/report/null/session_mediator_report.h'
396--- src/server/report/null/session_mediator_report.h 2015-07-16 07:03:19 +0000
397+++ src/server/report/null/session_mediator_report.h 2015-09-18 14:52:34 +0000
398@@ -53,8 +53,6 @@
399
400 void session_disconnect_called(std::string const& app_name) override;
401
402- void session_drm_auth_magic_called(std::string const& app_name) override;
403-
404 void session_configure_surface_called(std::string const& app_name) override;
405
406 void session_configure_surface_cursor_called(std::string const& app_name) override;
407
408=== modified file 'src/server/symbols.map'
409--- src/server/symbols.map 2015-09-16 21:04:57 +0000
410+++ src/server/symbols.map 2015-09-18 14:52:34 +0000
411@@ -1,4 +1,4 @@
412-MIR_SERVER_34 {
413+MIR_SERVER_35 {
414 global:
415 extern "C++" {
416 # Symbols not yet picked up by script
417
418=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
419--- tests/acceptance-tests/test_nested_mir.cpp 2015-09-15 15:45:58 +0000
420+++ tests/acceptance-tests/test_nested_mir.cpp 2015-09-18 14:52:34 +0000
421@@ -78,7 +78,6 @@
422 MOCK_METHOD2(session_start_prompt_session_called, void (std::string const&, pid_t));
423 MOCK_METHOD1(session_stop_prompt_session_called, void (std::string const&));
424
425- void session_drm_auth_magic_called(const std::string&) override {};
426 void session_configure_surface_called(std::string const&) override {};
427 void session_configure_surface_cursor_called(std::string const&) override {};
428 void session_configure_display_called(std::string const&) override {};
429
430=== modified file 'tests/acceptance-tests/test_session_mediator_report.cpp'
431--- tests/acceptance-tests/test_session_mediator_report.cpp 2015-07-16 07:03:19 +0000
432+++ tests/acceptance-tests/test_session_mediator_report.cpp 2015-09-18 14:52:34 +0000
433@@ -51,7 +51,6 @@
434 MOCK_METHOD2(session_start_prompt_session_called, void (std::string const&, pid_t));
435 MOCK_METHOD1(session_stop_prompt_session_called, void (std::string const&));
436
437- void session_drm_auth_magic_called(const std::string&) override {};
438 void session_configure_surface_called(std::string const&) override {};
439 void session_configure_surface_cursor_called(std::string const&) override {};
440 void session_configure_display_called(std::string const&) override {};
441
442=== modified file 'tests/include/mir/test/doubles/mock_nested_context.h'
443--- tests/include/mir/test/doubles/mock_nested_context.h 2015-04-28 07:54:10 +0000
444+++ tests/include/mir/test/doubles/mock_nested_context.h 2015-09-18 14:52:34 +0000
445@@ -47,7 +47,6 @@
446 struct MockNestedContext : graphics::NestedContext
447 {
448 MOCK_METHOD0(platform_fd_items, std::vector<int>());
449- MOCK_METHOD1(drm_auth_magic, void(int magic));
450 MOCK_METHOD2(platform_operation, graphics::PlatformOperationMessage(
451 unsigned int, graphics::PlatformOperationMessage const&));
452 };
453
454=== modified file 'tests/include/mir/test/doubles/stub_display_server.h'
455--- tests/include/mir/test/doubles/stub_display_server.h 2015-09-11 18:40:04 +0000
456+++ tests/include/mir/test/doubles/stub_display_server.h 2015-09-18 14:52:34 +0000
457@@ -54,10 +54,6 @@
458 mir::protobuf::SurfaceId const* /*request*/,
459 mir::protobuf::Void* /*response*/,
460 google::protobuf::Closure* /*done*/) {}
461- void drm_auth_magic(
462- mir::protobuf::DRMMagic const* /*request*/,
463- mir::protobuf::DRMAuthMagicStatus* /*response*/,
464- google::protobuf::Closure* /*done*/) {}
465 void platform_operation(
466 mir::protobuf::PlatformOperationMessage const* /*request*/,
467 mir::protobuf::PlatformOperationMessage* /*response*/,
468
469=== modified file 'tests/include/mir/test/stub_server_tool.h'
470--- tests/include/mir/test/stub_server_tool.h 2015-07-28 20:51:25 +0000
471+++ tests/include/mir/test/stub_server_tool.h 2015-09-18 14:52:34 +0000
472@@ -33,11 +33,6 @@
473
474 struct StubServerTool : doubles::StubDisplayServer
475 {
476- StubServerTool()
477- : drm_magic{0}
478- {
479- }
480-
481 virtual void create_surface(
482 mir::protobuf::SurfaceParameters const* request,
483 mir::protobuf::Surface* response,
484@@ -105,18 +100,6 @@
485 done->Run();
486 }
487
488- virtual void drm_auth_magic(
489- mir::protobuf::DRMMagic const* request,
490- mir::protobuf::DRMAuthMagicStatus* response,
491- google::protobuf::Closure* done) override
492- {
493- std::unique_lock<std::mutex> lock(guard);
494- drm_magic = request->magic();
495- response->set_status_code(0);
496- wait_condition.notify_one();
497- done->Run();
498- }
499-
500 virtual void configure_display(
501 mir::protobuf::DisplayConfiguration const*,
502 mir::protobuf::DisplayConfiguration*,
503@@ -129,7 +112,6 @@
504 std::string surface_name;
505 std::condition_variable wait_condition;
506 std::string app_name;
507- unsigned int drm_magic;
508 };
509
510 }
511
512=== modified file 'tests/include/mir/test/test_protobuf_client.h'
513--- tests/include/mir/test/test_protobuf_client.h 2015-07-28 23:05:14 +0000
514+++ tests/include/mir/test/test_protobuf_client.h 2015-09-18 14:52:34 +0000
515@@ -66,7 +66,6 @@
516 MOCK_METHOD0(exchange_buffer_done, void());
517 MOCK_METHOD0(release_surface_done, void());
518 MOCK_METHOD0(disconnect_done, void());
519- MOCK_METHOD0(drm_auth_magic_done, void());
520 MOCK_METHOD0(display_configure_done, void());
521 MOCK_METHOD0(prompt_session_start_done, void());
522 MOCK_METHOD0(prompt_session_stop_done, void());
523@@ -83,8 +82,6 @@
524
525 void on_disconnect_done();
526
527- void on_drm_auth_magic_done();
528-
529 void on_configure_display_done();
530
531 void wait_for_connect_done();
532@@ -99,8 +96,6 @@
533
534 void wait_for_disconnect_done();
535
536- void wait_for_drm_auth_magic_done();
537-
538 void wait_for_surface_count(int count);
539
540 void wait_for_disconnect_count(int count);
541@@ -122,7 +117,6 @@
542 std::atomic<bool> exchange_buffer_called;
543 std::atomic<bool> release_surface_called;
544 std::atomic<bool> disconnect_done_called;
545- std::atomic<bool> drm_auth_magic_done_called;
546 std::atomic<bool> configure_display_done_called;
547 std::atomic<bool> tfd_done_called;
548
549
550=== modified file 'tests/mir_test_doubles/test_protobuf_client.cpp'
551--- tests/mir_test_doubles/test_protobuf_client.cpp 2015-07-28 23:05:14 +0000
552+++ tests/mir_test_doubles/test_protobuf_client.cpp 2015-09-18 14:52:34 +0000
553@@ -56,7 +56,6 @@
554 exchange_buffer_called(false),
555 release_surface_called(false),
556 disconnect_done_called(false),
557- drm_auth_magic_done_called(false),
558 configure_display_done_called(false),
559 tfd_done_called(false),
560 connect_done_count(0),
561@@ -83,8 +82,6 @@
562 .WillByDefault(testing::Invoke(this, &TestProtobufClient::on_release_surface_done));
563 ON_CALL(*this, disconnect_done())
564 .WillByDefault(testing::Invoke(this, &TestProtobufClient::on_disconnect_done));
565- ON_CALL(*this, drm_auth_magic_done())
566- .WillByDefault(testing::Invoke(this, &TestProtobufClient::on_drm_auth_magic_done));
567 ON_CALL(*this, display_configure_done())
568 .WillByDefault(testing::Invoke(this, &TestProtobufClient::on_configure_display_done));
569 ON_CALL(*this, prompt_session_start_done())
570@@ -135,11 +132,6 @@
571 while (!disconnect_done_count.compare_exchange_weak(old, old+1));
572 }
573
574-void mir::test::TestProtobufClient::on_drm_auth_magic_done()
575-{
576- drm_auth_magic_done_called.store(true);
577-}
578-
579 void mir::test::TestProtobufClient::on_configure_display_done()
580 {
581 configure_display_done_called.store(true);
582@@ -217,16 +209,6 @@
583 disconnect_done_called.store(false);
584 }
585
586-void mir::test::TestProtobufClient::wait_for_drm_auth_magic_done()
587-{
588- for (int i = 0; !drm_auth_magic_done_called.load() && i < maxwait; ++i)
589- {
590- std::this_thread::sleep_for(std::chrono::milliseconds(1));
591- std::this_thread::yield();
592- }
593- drm_auth_magic_done_called.store(false);
594-}
595-
596 void mir::test::TestProtobufClient::wait_for_surface_count(int count)
597 {
598 for (int i = 0; count != create_surface_done_count.load() && i < 10000; ++i)
599
600=== modified file 'tests/unit-tests/client/test_protobuf_rpc_channel.cpp'
601--- tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2015-07-29 01:15:16 +0000
602+++ tests/unit-tests/client/test_protobuf_rpc_channel.cpp 2015-09-18 14:52:34 +0000
603@@ -482,19 +482,19 @@
604 auto typed_channel = std::dynamic_pointer_cast<mclr::MirProtobufRpcChannel>(channel);
605
606 mclr::DisplayServer channel_user{channel};
607- mir::protobuf::DRMMagic request;
608- mir::protobuf::DRMAuthMagicStatus reply;
609+ mir::protobuf::PingEvent request;
610+ mir::protobuf::Void reply;
611
612 bool first_response_called{false};
613 bool second_response_called{false};
614- channel_user.drm_auth_magic(&request,
615- &reply,
616- google::protobuf::NewCallback(&set_flag, &first_response_called));
617+ channel_user.pong(&request,
618+ &reply,
619+ google::protobuf::NewCallback(&set_flag, &first_response_called));
620
621 typed_channel->process_next_request_first();
622- channel_user.drm_auth_magic(&request,
623- &reply,
624- google::protobuf::NewCallback(&set_flag, &second_response_called));
625+ channel_user.pong(&request,
626+ &reply,
627+ google::protobuf::NewCallback(&set_flag, &second_response_called));
628
629 mir::protobuf::wire::Invocation wire_request;
630 mir::protobuf::wire::Result wire_reply;
631@@ -556,8 +556,8 @@
632 auto typed_channel = std::dynamic_pointer_cast<mclr::MirProtobufRpcChannel>(channel);
633
634 mclr::DisplayServer channel_user{channel};
635- mir::protobuf::DRMMagic drm_request;
636- mir::protobuf::DRMAuthMagicStatus drm_reply;
637+ mir::protobuf::PingEvent pong_request;
638+ mir::protobuf::Void pong_reply;
639
640 mir::protobuf::Buffer buffer_reply;
641 mir::protobuf::BufferRequest buffer_request;
642@@ -571,9 +571,9 @@
643 google::protobuf::NewCallback(&set_flag, &first_response_called));
644
645 typed_channel->process_next_request_first();
646- channel_user.drm_auth_magic(&drm_request,
647- &drm_reply,
648- google::protobuf::NewCallback(&set_flag, &second_response_called));
649+ channel_user.pong(&pong_request,
650+ &pong_reply,
651+ google::protobuf::NewCallback(&set_flag, &second_response_called));
652
653
654 std::initializer_list<mir::Fd> fds = {mir::Fd{open("/dev/null", O_RDONLY)},
655@@ -613,7 +613,7 @@
656 }
657
658 {
659- mir::protobuf::DRMAuthMagicStatus reply;
660+ mir::protobuf::Void reply;
661
662 mir::protobuf::wire::Invocation wire_request;
663 mir::protobuf::wire::Result wire_reply;
664
665=== modified file 'tests/unit-tests/frontend/stress_protobuf_communicator.cpp'
666--- tests/unit-tests/frontend/stress_protobuf_communicator.cpp 2015-07-28 23:05:14 +0000
667+++ tests/unit-tests/frontend/stress_protobuf_communicator.cpp 2015-09-18 14:52:34 +0000
668@@ -70,7 +70,6 @@
669 void exchange_buffer_done();
670 void release_surface_done();
671 void disconnect_done();
672- void drm_auth_magic_done();
673
674 void wait_for_connect_done();
675
676@@ -82,8 +81,6 @@
677
678 void wait_for_disconnect_done();
679
680- void wait_for_drm_auth_magic_done();
681-
682 void wait_for_surface_count(int count);
683
684 void wait_for_disconnect_count(int count);
685@@ -98,7 +95,6 @@
686 std::atomic<bool> exchange_buffer_called;
687 std::atomic<bool> release_surface_called;
688 std::atomic<bool> disconnect_done_called;
689- std::atomic<bool> drm_auth_magic_done_called;
690 std::atomic<bool> tfd_done_called;
691
692 std::atomic<int> connect_done_count;
693@@ -242,11 +238,6 @@
694 while (!disconnect_done_count.compare_exchange_weak(old, old+1));
695 }
696
697-void StubProtobufClient::drm_auth_magic_done()
698-{
699- drm_auth_magic_done_called.store(true);
700-}
701-
702 void StubProtobufClient::wait_for_connect_done()
703 {
704 for (int i = 0; !connect_done_called.load() && i < maxwait; ++i)
705@@ -299,16 +290,6 @@
706 disconnect_done_called.store(false);
707 }
708
709-void StubProtobufClient::wait_for_drm_auth_magic_done()
710-{
711- for (int i = 0; !drm_auth_magic_done_called.load() && i < maxwait; ++i)
712- {
713- std::this_thread::sleep_for(std::chrono::milliseconds(1));
714- std::this_thread::yield();
715- }
716- drm_auth_magic_done_called.store(false);
717-}
718-
719 void StubProtobufClient::wait_for_surface_count(int count)
720 {
721 for (int i = 0; count != create_surface_done_count.load() && i < 10000; ++i)
722
723=== modified file 'tests/unit-tests/frontend/test_published_socket_connector.cpp'
724--- tests/unit-tests/frontend/test_published_socket_connector.cpp 2015-08-20 02:44:54 +0000
725+++ tests/unit-tests/frontend/test_published_socket_connector.cpp 2015-09-18 14:52:34 +0000
726@@ -317,24 +317,6 @@
727 client->wait_for_disconnect_done();
728 }
729
730-TEST_F(PublishedSocketConnector, drm_auth_magic_is_processed_by_the_server)
731-{
732- mir::protobuf::DRMMagic magic;
733- mir::protobuf::DRMAuthMagicStatus status;
734- magic.set_magic(0x10111213);
735-
736- EXPECT_CALL(*client, drm_auth_magic_done()).Times(1);
737-
738- client->display_server.drm_auth_magic(
739- &magic,
740- &status,
741- google::protobuf::NewCallback(client.get(), &mt::TestProtobufClient::drm_auth_magic_done));
742-
743- client->wait_for_drm_auth_magic_done();
744-
745- EXPECT_EQ(magic.magic(), stub_server_tool->drm_magic);
746-}
747-
748 TEST_F(PublishedSocketConnector, disorderly_disconnection_handled)
749 {
750 using namespace testing;
751
752=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
753--- tests/unit-tests/frontend/test_session_mediator.cpp 2015-09-11 19:19:49 +0000
754+++ tests/unit-tests/frontend/test_session_mediator.cpp 2015-09-18 14:52:34 +0000
755@@ -241,8 +241,6 @@
756 mp::Surface surface_response;
757 mp::SurfaceId surface_id_request;
758 mp::Buffer buffer_response;
759- mp::DRMMagic drm_request;
760- mp::DRMAuthMagicStatus drm_response;
761 mp::BufferRequest buffer_request;
762 };
763 }
764@@ -303,10 +301,6 @@
765 }, std::logic_error);
766
767 EXPECT_THROW({
768- mediator.drm_auth_magic(&drm_request, &drm_response, null_callback.get());
769- }, std::logic_error);
770-
771- EXPECT_THROW({
772 mediator.disconnect(nullptr, nullptr, null_callback.get());
773 }, std::logic_error);
774 }
775@@ -349,10 +343,6 @@
776 }, std::logic_error);
777
778 EXPECT_THROW({
779- mediator.drm_auth_magic(&drm_request, &drm_response, null_callback.get());
780- }, std::logic_error);
781-
782- EXPECT_THROW({
783 mediator.disconnect(nullptr, nullptr, null_callback.get());
784 }, std::logic_error);
785 }
786@@ -853,33 +843,6 @@
787 buffer_request.mutable_buffer()->clear_fd();
788 }
789
790-//FIXME: we have an platform specific request in the protocol!
791-TEST_F(SessionMediator, drm_auth_magic_calls_platform_operation_abstraction)
792-{
793- using namespace testing;
794-
795- int magic{0x3248};
796- int test_response{4};
797- mg::PlatformOperationMessage response;
798- response.data.resize(sizeof(int));
799- *(reinterpret_cast<int*>(response.data.data())) = test_response;
800-
801- mg::PlatformOperationMessage request;
802- drm_request.set_magic(magic);
803-
804- EXPECT_CALL(mock_ipc_operations, platform_operation(_, _))
805- .Times(1)
806- .WillOnce(DoAll(SaveArg<1>(&request), Return(response)));
807-
808- mediator.connect(&connect_parameters, &connection, null_callback.get());
809- mediator.drm_auth_magic(&drm_request, &drm_response, null_callback.get());
810- mediator.disconnect(nullptr, nullptr, null_callback.get());
811-
812- ASSERT_THAT(request.data.size(), Eq(sizeof(int)));
813- EXPECT_THAT(*(reinterpret_cast<int*>(request.data.data())), Eq(magic));
814- EXPECT_THAT(drm_response.status_code(), Eq(test_response));
815-}
816-
817 // Regression test for LP: #1441759
818 TEST_F(SessionMediator, completes_exchange_buffer_when_completion_is_invoked_asynchronously_from_thread_that_initiated_exchange)
819 {

Subscribers

People subscribed via source and target branches