1
=== modified file 'src/include/server/mir/default_server_status_listener.h'
2
--- src/include/server/mir/default_server_status_listener.h	2015-02-22 07:46:25 +0000
3
+++ src/include/server/mir/default_server_status_listener.h	2016-06-10 18:31:23 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright © 2013 Canonical Ltd.
2
 * Copyright © 2013,2016 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
10
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU General Public License version 3,
11
@@ -20,23 +20,23 @@
12
20
#define MIR_DEFAULT_SERVER_STATUS_LISTENER_H_
20
#define MIR_DEFAULT_SERVER_STATUS_LISTENER_H_
13
21
21
14
22
#include "mir/server_status_listener.h"
22
#include "mir/server_status_listener.h"
15
23
#include "mir/scene/session.h"
16
23
24
17
24
namespace mir
25
namespace mir
18
25
{
26
{
19
27
namespace scene
20
28
{
21
29
class SessionContainer;
22
30
}
23
26
class DefaultServerStatusListener : public virtual ServerStatusListener
31
class DefaultServerStatusListener : public virtual ServerStatusListener
24
27
{
32
{
25
28
public:
33
public:
37
29
    virtual void paused()
34
    DefaultServerStatusListener(std::shared_ptr<scene::SessionContainer> const& session_container);
38
30
    {
35
    void paused() override;
39
31
    }
36
    void resumed() override;
40
32
37
    void started() override;
41
33
    virtual void resumed()
38
private:
42
34
    {
39
    std::shared_ptr<scene::SessionContainer> const session_container;
32
35
    }
33
36
34
37
    virtual void started()
35
38
    {
36
39
    }
43
40
};
40
};
44
41
}
41
}
45
42
42
46
43
43
47
=== modified file 'src/server/CMakeLists.txt'
48
--- src/server/CMakeLists.txt	2016-06-02 05:33:50 +0000
49
+++ src/server/CMakeLists.txt	2016-06-10 18:31:23 +0000
50
@@ -52,6 +52,7 @@
51
52
  terminate_with_current_exception.cpp
52
  terminate_with_current_exception.cpp
52
53
  display_server.cpp
53
  display_server.cpp
53
54
  default_server_configuration.cpp
54
  default_server_configuration.cpp
54
55
  default_server_status_listener.cpp
55
55
  glib_main_loop.cpp
56
  glib_main_loop.cpp
56
56
  glib_main_loop_sources.cpp
57
  glib_main_loop_sources.cpp
57
57
  default_emergency_cleanup.cpp
58
  default_emergency_cleanup.cpp
58
58
59
59
=== modified file 'src/server/default_server_configuration.cpp'
60
--- src/server/default_server_configuration.cpp	2016-06-02 05:33:50 +0000
61
+++ src/server/default_server_configuration.cpp	2016-06-10 18:31:23 +0000
62
@@ -166,9 +166,9 @@
63
166
std::shared_ptr<mir::ServerStatusListener> mir::DefaultServerConfiguration::the_server_status_listener()
166
std::shared_ptr<mir::ServerStatusListener> mir::DefaultServerConfiguration::the_server_status_listener()
64
167
{
167
{
65
168
    return server_status_listener(
168
    return server_status_listener(
67
169
        []()
169
        [this]()
68
170
        {
170
        {
70
171
            return std::make_shared<mir::DefaultServerStatusListener>();
171
            return std::make_shared<mir::DefaultServerStatusListener>(the_session_container());
71
172
        });
172
        });
72
173
}
173
}
73
174
174
74
175
175
75
=== added file 'src/server/default_server_status_listener.cpp'
76
--- src/server/default_server_status_listener.cpp	1970-01-01 00:00:00 +0000
77
+++ src/server/default_server_status_listener.cpp	2016-06-10 18:31:23 +0000
78
@@ -0,0 +1,50 @@
79
1
/*
80
2
 * Copyright © 2016 Canonical Ltd.
81
3
 *
82
4
 * This program is free software: you can redistribute it and/or modify it
83
5
 * under the terms of the GNU General Public License version 3,
84
6
 * as published by the Free Software Foundation.
85
7
 *
86
8
 * This program is distributed in the hope that it will be useful,
87
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
88
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
89
11
 * GNU General Public License for more details.
90
12
 *
91
13
 * You should have received a copy of the GNU General Public License
92
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
93
15
 *
94
16
 * Authored by: Andreas Pokorny <andreas.pokorny@canonical.com>
95
17
 */
96
18
97
19
#include "mir/default_server_status_listener.h"
98
20
#include "scene/session_container.h"
99
21
100
22
#include "mir/scene/session.h"
101
23
102
24
mir::DefaultServerStatusListener::DefaultServerStatusListener(
103
25
    std::shared_ptr<scene::SessionContainer> const& session_container)
104
26
    : session_container{session_container}
105
27
{
106
28
}
107
29
108
30
void mir::DefaultServerStatusListener::paused()
109
31
{
110
32
    session_container->for_each(
111
33
        [](std::shared_ptr<scene::Session> const& session)
112
34
        {
113
35
            session->set_lifecycle_state(mir_lifecycle_state_will_suspend);
114
36
        });
115
37
}
116
38
117
39
void mir::DefaultServerStatusListener::resumed()
118
40
{
119
41
    session_container->for_each(
120
42
        [](std::shared_ptr<scene::Session> const& session)
121
43
        {
122
44
            session->set_lifecycle_state(mir_lifecycle_state_resumed);
123
45
        });
124
46
}
125
47
126
48
void mir::DefaultServerStatusListener::started()
127
49
{
128
50
}
129
0
51
130
=== modified file 'src/server/graphics/nested/display.cpp'
131
--- src/server/graphics/nested/display.cpp	2016-05-20 13:08:56 +0000
132
+++ src/server/graphics/nested/display.cpp	2016-06-10 18:31:23 +0000
133
@@ -26,6 +26,7 @@
134
26
#include "mir/graphics/gl_context.h"
26
#include "mir/graphics/gl_context.h"
135
27
#include "mir/graphics/surfaceless_egl_context.h"
27
#include "mir/graphics/surfaceless_egl_context.h"
136
28
#include "mir/graphics/display_configuration_policy.h"
28
#include "mir/graphics/display_configuration_policy.h"
137
29
#include "mir/graphics/event_handler_register.h"
138
29
#include "mir/graphics/overlapping_output_grouping.h"
30
#include "mir/graphics/overlapping_output_grouping.h"
139
30
#include "mir/graphics/gl_config.h"
31
#include "mir/graphics/gl_config.h"
140
31
#include "mir/graphics/egl_error.h"
32
#include "mir/graphics/egl_error.h"
141
@@ -33,6 +34,7 @@
142
33
#include "mir_toolkit/mir_connection.h"
34
#include "mir_toolkit/mir_connection.h"
143
34
#include "mir/raii.h"
35
#include "mir/raii.h"
144
35
36
145
37
#include <sys/eventfd.h>
146
36
#include <boost/throw_exception.hpp>
38
#include <boost/throw_exception.hpp>
147
37
#include <stdexcept>
39
#include <stdexcept>
148
38
#include <sstream>
40
#include <sstream>
149
@@ -186,8 +188,14 @@
150
186
    display_report{display_report},
188
    display_report{display_report},
151
187
    egl_display{connection->egl_native_display(), gl_config},
189
    egl_display{connection->egl_native_display(), gl_config},
152
188
    outputs{},
190
    outputs{},
154
189
    current_configuration(std::make_unique<NestedDisplayConfiguration>(connection->create_display_config()))
191
    current_configuration(std::make_unique<NestedDisplayConfiguration>(connection->create_display_config())),
155
192
    lifecycle_trigger{eventfd(0, EFD_CLOEXEC|EFD_NONBLOCK|EFD_SEMAPHORE)}
156
190
{
193
{
157
194
    if (lifecycle_trigger < 0)
158
195
        BOOST_THROW_EXCEPTION((std::system_error{errno,
159
196
                                                 std::system_category(),
160
197
                                                 "Failed to create event fd for nested display"}));
161
198
162
191
    decltype(current_configuration) conf{dynamic_cast<NestedDisplayConfiguration*>(current_configuration->clone().release())};
199
    decltype(current_configuration) conf{dynamic_cast<NestedDisplayConfiguration*>(current_configuration->clone().release())};
163
192
200
164
193
    initial_conf_policy->apply_to(*conf);
201
    initial_conf_policy->apply_to(*conf);
165
@@ -198,11 +206,27 @@
166
198
        swap(current_configuration, conf);
206
        swap(current_configuration, conf);
167
199
    }
207
    }
168
200
208
169
209
    connection->set_lifecycle_event_callback(
170
210
        [this](MirLifecycleState state)
171
211
        {
172
212
            std::lock_guard<std::mutex> lock_display_state(pause_resume_status_mutex);
173
213
            lifecycle_state = state;
174
214
            uint64_t dummy = 1;
175
215
            if (write(lifecycle_trigger, &dummy, sizeof dummy) != sizeof dummy)
176
216
                BOOST_THROW_EXCEPTION((std::system_error{errno,
177
217
                                                         std::system_category(),
178
218
                                                         "Failed to notify lifecycle event fd notification"}));
179
219
180
220
        });
181
221
182
201
    create_surfaces(*current_configuration);
222
    create_surfaces(*current_configuration);
183
202
}
223
}
184
203
224
185
204
mgn::Display::~Display() noexcept
225
mgn::Display::~Display() noexcept
186
205
{
226
{
187
227
    connection->set_lifecycle_event_callback([](MirLifecycleState){});
188
228
    if (registered)
189
229
        registered->unregister_fd_handler(this);
190
206
    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
230
    eglBindAPI(MIR_SERVER_EGL_OPENGL_API);
191
207
    if (eglGetCurrentContext() == egl_display.egl_context())
231
    if (eglGetCurrentContext() == egl_display.egl_context())
192
208
        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
232
        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
193
@@ -343,21 +367,33 @@
194
343
}
367
}
195
344
368
196
345
void mgn::Display::register_pause_resume_handlers(
369
void mgn::Display::register_pause_resume_handlers(
200
346
        EventHandlerRegister& /*handlers*/,
370
        EventHandlerRegister& handlers,
201
347
        DisplayPauseHandler const& /*pause_handler*/,
371
        DisplayPauseHandler const& pause_handler,
202
348
        DisplayResumeHandler const& /*resume_handler*/)
372
        DisplayResumeHandler const& resume_handler)
203
349
{
373
{
205
350
    // No need to do anything
374
    registered = &handlers;
206
375
    handlers.register_fd_handler(
207
376
        {int(lifecycle_trigger)},
208
377
        this,
209
378
        [this](int)
210
379
        {
211
380
            update_pause_state();
212
381
        });
213
382
    std::lock_guard<std::mutex> lock_display_state(pause_resume_status_mutex);
214
383
    this->pause_handler = pause_handler;
215
384
    this->resume_handler = resume_handler;
216
351
}
385
}
217
352
386
218
353
void mgn::Display::pause()
387
void mgn::Display::pause()
219
354
{
388
{
221
355
    // No need to do anything
389
    std::lock_guard<std::mutex> lock_display_state(pause_resume_status_mutex);
222
390
    display_state = DisplayState::paused;
223
356
}
391
}
224
357
392
225
358
void mgn::Display::resume()
393
void mgn::Display::resume()
226
359
{
394
{
228
360
    // No need to do anything
395
    std::lock_guard<std::mutex> lock_display_state(pause_resume_status_mutex);
229
396
    display_state = DisplayState::running;
230
361
}
397
}
231
362
398
232
363
auto mgn::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /*initial_image*/) -> std::shared_ptr<mg::Cursor>
399
auto mgn::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /*initial_image*/) -> std::shared_ptr<mg::Cursor>
233
@@ -375,3 +411,30 @@
234
375
{
411
{
235
376
    return nullptr;
412
    return nullptr;
236
377
}
413
}
237
414
238
415
void mgn::Display::update_pause_state()
239
416
{
240
417
    uint64_t dummy;
241
418
    if (read(lifecycle_trigger, &dummy, sizeof dummy) != sizeof dummy)
242
419
    {
243
420
        if (errno == EAGAIN)
244
421
        {
245
422
            return;
246
423
        }
247
424
        BOOST_THROW_EXCEPTION((std::system_error{errno,
248
425
                                                 std::system_category(),
249
426
                                                 "Failed to consume nested fd notification"}));
250
427
    }
251
428
252
429
    std::unique_lock<std::mutex> lock_display_state(pause_resume_status_mutex);
253
430
    if (display_state != DisplayState::running && lifecycle_state == mir_lifecycle_state_resumed && resume_handler)
254
431
    {
255
432
        lock_display_state.unlock();
256
433
        resume_handler();
257
434
    }
258
435
    else if (display_state != DisplayState::paused && lifecycle_state == mir_lifecycle_state_will_suspend && pause_handler)
259
436
    {
260
437
        lock_display_state.unlock();
261
438
        pause_handler();
262
439
    }
263
440
}
264
378
441
265
=== modified file 'src/server/graphics/nested/display.h'
266
--- src/server/graphics/nested/display.h	2016-05-20 13:08:56 +0000
267
+++ src/server/graphics/nested/display.h	2016-06-10 18:31:23 +0000
268
@@ -23,6 +23,7 @@
269
23
#include "mir/graphics/display_buffer.h"
23
#include "mir/graphics/display_buffer.h"
270
24
#include "mir/graphics/display_configuration.h"
24
#include "mir/graphics/display_configuration.h"
271
25
#include "mir/graphics/egl_resources.h"
25
#include "mir/graphics/egl_resources.h"
272
26
#include "mir/fd.h"
273
26
27
274
27
#include "mir_toolkit/client_types.h"
28
#include "mir_toolkit/client_types.h"
275
28
29
276
@@ -154,8 +155,22 @@
277
154
    std::mutex mutable configuration_mutex;
155
    std::mutex mutable configuration_mutex;
278
155
    std::unique_ptr<NestedDisplayConfiguration> current_configuration;
156
    std::unique_ptr<NestedDisplayConfiguration> current_configuration;
279
156
157
280
158
    std::mutex pause_resume_status_mutex;
281
159
    mir::Fd lifecycle_trigger;
282
160
    EventHandlerRegister* registered{nullptr};
283
161
    enum class DisplayState
284
162
    {
285
163
        running,
286
164
        paused,
287
165
    };
288
166
    DisplayState display_state{DisplayState::running};
289
167
    MirLifecycleState lifecycle_state{mir_lifecycle_connection_lost};
290
168
    DisplayPauseHandler pause_handler;
291
169
    DisplayResumeHandler resume_handler;
292
170
293
157
    void create_surfaces(mir::graphics::DisplayConfiguration const& configuration);
171
    void create_surfaces(mir::graphics::DisplayConfiguration const& configuration);
294
158
    void complete_display_initialization(MirPixelFormat format);
172
    void complete_display_initialization(MirPixelFormat format);
295
173
    void update_pause_state();
296
159
};
174
};
297
160
175
298
161
}
176
}
299
162
177
300
=== modified file 'src/server/graphics/nested/host_connection.h'
301
--- src/server/graphics/nested/host_connection.h	2016-06-07 16:20:53 +0000
302
+++ src/server/graphics/nested/host_connection.h	2016-06-10 18:31:23 +0000
303
@@ -56,6 +56,7 @@
304
56
    virtual void set_cursor_image(CursorImage const& image) = 0;
56
    virtual void set_cursor_image(CursorImage const& image) = 0;
305
57
    virtual void hide_cursor() = 0;
57
    virtual void hide_cursor() = 0;
306
58
    virtual auto graphics_platform_library() -> std::string = 0;
58
    virtual auto graphics_platform_library() -> std::string = 0;
307
59
    virtual void set_lifecycle_event_callback(std::function<void(MirLifecycleState)> const& cb) = 0;
308
59
60
309
60
    virtual UniqueInputConfig create_input_device_config() = 0;
61
    virtual UniqueInputConfig create_input_device_config() = 0;
310
61
    virtual void set_input_device_change_callback(std::function<void(UniqueInputConfig)> const& cb) = 0;
62
    virtual void set_input_device_change_callback(std::function<void(UniqueInputConfig)> const& cb) = 0;
311
62
63
312
=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
313
--- src/server/graphics/nested/mir_client_host_connection.cpp	2016-06-09 13:15:34 +0000
314
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2016-06-10 18:31:23 +0000
315
@@ -29,6 +29,7 @@
316
29
#include "mir/input/input_device_observer.h"
29
#include "mir/input/input_device_observer.h"
317
30
#include "mir/frontend/event_sink.h"
30
#include "mir/frontend/event_sink.h"
318
31
#include "mir/server_action_queue.h"
31
#include "mir/server_action_queue.h"
319
32
#include "mir/report_exception.h"
320
32
33
321
33
#include <boost/throw_exception.hpp>
34
#include <boost/throw_exception.hpp>
322
34
#include <boost/exception/errinfo_errno.hpp>
35
#include <boost/exception/errinfo_errno.hpp>
323
@@ -62,12 +63,6 @@
324
62
    *reply_ptr = reply;
63
    *reply_ptr = reply;
325
63
}
64
}
326
64
65
327
65
static void nested_lifecycle_event_callback_thunk(MirConnection* /*connection*/, MirLifecycleState state, void *context)
328
66
{
329
67
    msh::HostLifecycleEventListener* listener = static_cast<msh::HostLifecycleEventListener*>(context);
330
68
    listener->lifecycle_event_occurred(state);
331
69
}
332
70
333
71
MirPixelFormat const cursor_pixel_format = mir_pixel_format_argb_8888;
66
MirPixelFormat const cursor_pixel_format = mir_pixel_format_argb_8888;
334
72
67
335
73
void copy_image(MirGraphicsRegion const& g, mg::CursorImage const& image)
68
void copy_image(MirGraphicsRegion const& g, mg::CursorImage const& image)
336
@@ -227,6 +222,7 @@
337
227
    std::shared_ptr<msh::HostLifecycleEventListener> const& host_lifecycle_event_listener)
222
    std::shared_ptr<msh::HostLifecycleEventListener> const& host_lifecycle_event_listener)
338
228
    : mir_connection{mir_connect_sync(host_socket.c_str(), name.c_str())},
223
    : mir_connection{mir_connect_sync(host_socket.c_str(), name.c_str())},
339
229
      conf_change_callback{[]{}},
224
      conf_change_callback{[]{}},
340
225
      lifecycle_callback{[](MirLifecycleState){}},
341
230
      host_lifecycle_event_listener{host_lifecycle_event_listener},
226
      host_lifecycle_event_listener{host_lifecycle_event_listener},
342
231
      event_callback{[](MirEvent const&, mir::geometry::Rectangle const&){}}
227
      event_callback{[](MirEvent const&, mir::geometry::Rectangle const&){}}
343
232
{
228
{
344
@@ -241,8 +237,20 @@
345
241
237
346
242
    mir_connection_set_lifecycle_event_callback(
238
    mir_connection_set_lifecycle_event_callback(
347
243
        mir_connection,
239
        mir_connection,
350
244
        nested_lifecycle_event_callback_thunk,
240
        [](MirConnection* /*connection*/, MirLifecycleState state, void *context)
351
245
        std::static_pointer_cast<void>(host_lifecycle_event_listener).get());
241
        {
352
242
            mgn::MirClientHostConnection* obj = static_cast<mgn::MirClientHostConnection*>(context);
353
243
            try
354
244
            {
355
245
                obj->handle_lifecycle_event(state);
356
246
            }
357
247
            catch(...)
358
248
            {
359
249
                report_exception();
360
250
                abort();
361
251
            }
362
252
        },
363
253
        static_cast<void*>(this));
364
246
254
365
247
    mir_connection_set_input_config_change_callback(
255
    mir_connection_set_input_config_change_callback(
366
248
        mir_connection,
256
        mir_connection,
367
@@ -412,3 +420,14 @@
368
412
{
420
{
369
413
    event_callback(event, source_frame);
421
    event_callback(event, source_frame);
370
414
}
422
}
371
423
372
424
void mgn::MirClientHostConnection::set_lifecycle_event_callback(std::function<void(MirLifecycleState)> const& cb)
373
425
{
374
426
    lifecycle_callback = cb;
375
427
}
376
428
377
429
void mgn::MirClientHostConnection::handle_lifecycle_event(MirLifecycleState state)
378
430
{
379
431
    host_lifecycle_event_listener->lifecycle_event_occurred(state);
380
432
    lifecycle_callback(state);
381
433
}
382
415
434
383
=== modified file 'src/server/graphics/nested/mir_client_host_connection.h'
384
--- src/server/graphics/nested/mir_client_host_connection.h	2016-06-07 16:20:53 +0000
385
+++ src/server/graphics/nested/mir_client_host_connection.h	2016-06-10 18:31:23 +0000
386
@@ -66,6 +66,7 @@
387
66
        int width, int height, MirPixelFormat pf, char const* name,
66
        int width, int height, MirPixelFormat pf, char const* name,
388
67
        MirBufferUsage usage, uint32_t output_id) override;
67
        MirBufferUsage usage, uint32_t output_id) override;
389
68
    void set_display_config_change_callback(std::function<void()> const& cb) override;
68
    void set_display_config_change_callback(std::function<void()> const& cb) override;
390
69
    void set_lifecycle_event_callback(std::function<void(MirLifecycleState)> const& cb) override;
391
69
    void apply_display_config(MirDisplayConfiguration&) override;
70
    void apply_display_config(MirDisplayConfiguration&) override;
392
70
71
393
71
    void set_cursor_image(CursorImage const& image) override;
72
    void set_cursor_image(CursorImage const& image) override;
394
@@ -80,12 +81,14 @@
395
80
    void set_input_event_callback(std::function<void(MirEvent const&, mir::geometry::Rectangle const&)> const& cb) override;
81
    void set_input_event_callback(std::function<void(MirEvent const&, mir::geometry::Rectangle const&)> const& cb) override;
396
81
    void emit_input_event(MirEvent const& cb, mir::geometry::Rectangle const& source_frame) override;
82
    void emit_input_event(MirEvent const& cb, mir::geometry::Rectangle const& source_frame) override;
397
82
83
398
84
    void handle_lifecycle_event(MirLifecycleState state);
399
83
private:
85
private:
400
84
    void update_input_config(UniqueInputConfig input_config);
86
    void update_input_config(UniqueInputConfig input_config);
401
85
    std::mutex surfaces_mutex;
87
    std::mutex surfaces_mutex;
402
86
88
403
87
    MirConnection* const mir_connection;
89
    MirConnection* const mir_connection;
404
88
    std::function<void()> conf_change_callback;
90
    std::function<void()> conf_change_callback;
405
91
    std::function<void(MirLifecycleState)> lifecycle_callback;
406
89
    std::shared_ptr<msh::HostLifecycleEventListener> const host_lifecycle_event_listener;
92
    std::shared_ptr<msh::HostLifecycleEventListener> const host_lifecycle_event_listener;
407
90
93
408
91
    std::vector<HostSurface*> surfaces;
94
    std::vector<HostSurface*> surfaces;
409
92
95
410
=== modified file 'tests/include/mir/test/doubles/stub_host_connection.h'
411
--- tests/include/mir/test/doubles/stub_host_connection.h	2016-06-09 13:15:34 +0000
412
+++ tests/include/mir/test/doubles/stub_host_connection.h	2016-06-10 18:31:23 +0000
413
@@ -50,6 +50,10 @@
414
50
    {
50
    {
415
51
    }
51
    }
416
52
52
417
53
    void set_lifecycle_event_callback(std::function<void(MirLifecycleState)> const&) override
418
54
    {
419
55
    }
420
56
421
53
    void apply_display_config(MirDisplayConfiguration&) override {}
57
    void apply_display_config(MirDisplayConfiguration&) override {}
422
54
58
423
55
    std::shared_ptr<graphics::nested::HostSurface>
59
    std::shared_ptr<graphics::nested::HostSurface>
424
56
60
425
=== modified file 'tests/unit-tests/graphics/nested/test_nested_display.cpp'
426
--- tests/unit-tests/graphics/nested/test_nested_display.cpp	2016-05-04 20:53:03 +0000
427
+++ tests/unit-tests/graphics/nested/test_nested_display.cpp	2016-06-10 18:31:23 +0000
428
@@ -21,8 +21,9 @@
429
21
#include "src/server/graphics/nested/host_surface.h"
21
#include "src/server/graphics/nested/host_surface.h"
430
22
#include "src/server/report/null/display_report.h"
22
#include "src/server/report/null/display_report.h"
431
23
#include "mir/graphics/default_display_configuration_policy.h"
23
#include "mir/graphics/default_display_configuration_policy.h"
433
24
#include "src/server/input/null_input_dispatcher.h"
24
#include "mir/graphics/event_handler_register.h"
434
25
#include "mir_display_configuration_builder.h"
25
#include "mir_display_configuration_builder.h"
435
26
#include "mir/events/event_builders.h"
436
26
27
437
27
#include "mir/test/doubles/mock_egl.h"
28
#include "mir/test/doubles/mock_egl.h"
438
28
#include "mir/test/doubles/mock_gl_config.h"
29
#include "mir/test/doubles/mock_gl_config.h"
439
@@ -44,6 +45,32 @@
440
44
namespace
45
namespace
441
45
{
46
{
442
46
47
443
48
struct StubEventHandlerRegister : mg::EventHandlerRegister
444
49
{
445
50
public:
446
51
    void register_signal_handler(std::initializer_list<int>, std::function<void(int)> const&) override
447
52
    {
448
53
    }
449
54
450
55
    void register_signal_handler(std::initializer_list<int>, mir::UniqueModulePtr<std::function<void(int)>>) override
451
56
    {
452
57
    }
453
58
454
59
    void register_fd_handler(std::initializer_list<int> fds, void const*, std::function<void(int)> const& callback) override
455
60
    {
456
61
        int fd = *begin(fds);
457
62
        event_callback = [fd, callback]{callback(fd);};
458
63
    }
459
64
460
65
    void register_fd_handler(std::initializer_list<int>,
461
66
                             void const*,
462
67
                             mir::UniqueModulePtr<std::function<void(int)>>) override{};
463
68
464
69
    void unregister_fd_handler(void const*) override{};
465
70
466
71
    std::function<void()> event_callback;
467
72
};
468
73
469
47
class SingleDisplayHostConnection : public mtd::StubHostConnection
74
class SingleDisplayHostConnection : public mtd::StubHostConnection
470
48
{
75
{
471
49
public:
76
public:
472
@@ -51,6 +78,23 @@
473
51
    {
78
    {
474
52
        return mt::build_trivial_configuration();
79
        return mt::build_trivial_configuration();
475
53
    }
80
    }
476
81
477
82
    void set_lifecycle_event_callback(std::function<void(MirLifecycleState)> const& cb) override
478
83
    {
479
84
        lifecycle_callback = cb;
480
85
    }
481
86
482
87
    void simulate_suspend()
483
88
    {
484
89
        lifecycle_callback(mir_lifecycle_state_will_suspend);
485
90
    }
486
91
487
92
    void simulate_resume()
488
93
    {
489
94
        lifecycle_callback(mir_lifecycle_state_resumed);
490
95
    }
491
96
492
97
    std::function<void(MirLifecycleState)> lifecycle_callback;
493
54
};
98
};
494
55
99
495
56
class MockApplyDisplayConfigHostConnection : public SingleDisplayHostConnection
100
class MockApplyDisplayConfigHostConnection : public SingleDisplayHostConnection
496
@@ -67,7 +111,7 @@
497
67
    {
111
    {
498
68
        auto nested_display_raw = new mgn::Display{
112
        auto nested_display_raw = new mgn::Display{
499
69
            platform,
113
            platform,
501
70
            std::make_shared<SingleDisplayHostConnection>(),
114
            connection,
502
71
            mt::fake_shared(null_display_report),
115
            mt::fake_shared(null_display_report),
503
72
            mt::fake_shared(default_conf_policy),
116
            mt::fake_shared(default_conf_policy),
504
73
            gl_config};
117
            gl_config};
505
@@ -75,13 +119,33 @@
506
75
        return std::unique_ptr<mgn::Display>{nested_display_raw};
119
        return std::unique_ptr<mgn::Display>{nested_display_raw};
507
76
    }
120
    }
508
77
121
509
122
    std::shared_ptr<SingleDisplayHostConnection> const connection = std::make_shared<SingleDisplayHostConnection>();
510
78
    testing::NiceMock<mtd::MockEGL> mock_egl;
123
    testing::NiceMock<mtd::MockEGL> mock_egl;
511
79
    mi::NullInputDispatcher null_input_dispatcher;
512
80
    mir::report::null::DisplayReport null_display_report;
124
    mir::report::null::DisplayReport null_display_report;
513
81
    mg::CloneDisplayConfigurationPolicy default_conf_policy;
125
    mg::CloneDisplayConfigurationPolicy default_conf_policy;
514
82
    mtd::StubGLConfig stub_gl_config;
126
    mtd::StubGLConfig stub_gl_config;
515
83
    std::shared_ptr<mtd::NullPlatform> null_platform{
127
    std::shared_ptr<mtd::NullPlatform> null_platform{
516
84
        std::make_shared<mtd::NullPlatform>()};
128
        std::make_shared<mtd::NullPlatform>()};
517
129
    StubEventHandlerRegister stub_event_handler_register;
518
130
519
131
    MOCK_METHOD0(pause, void());
520
132
    MOCK_METHOD0(resume, void());
521
133
522
134
    void install_pause_resume_handlers(mgn::Display& display)
523
135
    {
524
136
        display.register_pause_resume_handlers(
525
137
            stub_event_handler_register,
526
138
            [this]()
527
139
            {
528
140
                pause();
529
141
                return true;
530
142
            },
531
143
            [this]()
532
144
            {
533
145
                resume();
534
146
                return true;
535
147
            });
536
148
    }
537
85
};
149
};
538
86
150
539
87
}
151
}
540
@@ -243,3 +307,40 @@
541
243
307
542
244
    auto dummy_context = nested_display->create_gl_context();
308
    auto dummy_context = nested_display->create_gl_context();
543
245
}
309
}
544
310
545
311
TEST_F(NestedDisplay, pauses_server_on_suspend)
546
312
{
547
313
    using namespace testing;
548
314
549
315
    auto const nested_display = create_nested_display(
550
316
        null_platform,
551
317
        mt::fake_shared(stub_gl_config));
552
318
553
319
    install_pause_resume_handlers(*nested_display);
554
320
555
321
    EXPECT_CALL(*this, pause());
556
322
    connection->simulate_suspend();
557
323
    stub_event_handler_register.event_callback();
558
324
}
559
325
560
326
TEST_F(NestedDisplay, resumes_server_on_lifecycle_resume)
561
327
{
562
328
    using namespace testing;
563
329
564
330
    auto const nested_display = create_nested_display(
565
331
        null_platform,
566
332
        mt::fake_shared(stub_gl_config));
567
333
568
334
    install_pause_resume_handlers(*nested_display);
569
335
570
336
    EXPECT_CALL(*this, pause());
571
337
    EXPECT_CALL(*this, resume());
572
338
573
339
    connection->simulate_suspend();
574
340
    stub_event_handler_register.event_callback();
575
341
576
342
    nested_display->pause();
577
343
578
344
    connection->simulate_resume();
579
345
    stub_event_handler_register.event_callback();
580
346
}
Status:	Rejected
Rejected by:	Andreas Pokorny on 2016-06-13
Proposed branch:	lp:~andreas-pokorny/mir/use-lifecycleevent-in-mirserver
Merge into:	lp:mir
Diff against target:	580 lines (+289/-32) 11 files modified src/include/server/mir/default_server_status_listener.h (+12/-12) src/server/CMakeLists.txt (+1/-0) src/server/default_server_configuration.cpp (+2/-2) src/server/default_server_status_listener.cpp (+50/-0) src/server/graphics/nested/display.cpp (+70/-7) src/server/graphics/nested/display.h (+15/-0) src/server/graphics/nested/host_connection.h (+1/-0) src/server/graphics/nested/mir_client_host_connection.cpp (+27/-8) src/server/graphics/nested/mir_client_host_connection.h (+3/-0) tests/include/mir/test/doubles/stub_host_connection.h (+4/-0) tests/unit-tests/graphics/nested/test_nested_display.cpp (+104/-3)
To merge this branch:	bzr merge lp:~andreas-pokorny/mir/use-lifecycleevent-in-mirserver
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-06-10
Alan Griffiths		2016-04-20	Approve on 2016-06-09
Chris Halse Rogers			Needs Fixing on 2016-04-29
Alberto Aguirre (community)			Needs Information on 2016-04-27
Brandon Schaefer (community)			Approve on 2016-04-26
Cemil Azizoglu (community)			Approve on 2016-04-26
Review via email: mp+292375@code.launchpad.net