1
=== modified file 'src/server/shell/default_persistent_surface_store.cpp'
2
--- src/server/shell/default_persistent_surface_store.cpp	2017-07-28 17:00:43 +0000
3
+++ src/server/shell/default_persistent_surface_store.cpp	2017-08-14 02:49:35 +0000
4
@@ -82,6 +82,7 @@
5
82
auto msh::DefaultPersistentSurfaceStore::id_for_surface(std::shared_ptr<scene::Surface> const& surface)
82
auto msh::DefaultPersistentSurfaceStore::id_for_surface(std::shared_ptr<scene::Surface> const& surface)
6
83
    -> Id
83
    -> Id
7
84
{
84
{
8
85
    std::lock_guard<std::mutex> lock{mutex};
9
85
    return store->insert_or_retrieve(surface);
86
    return store->insert_or_retrieve(surface);
10
86
}
87
}
11
87
88
12
@@ -89,6 +90,7 @@
13
89
{
90
{
14
90
    try
91
    try
15
91
    {
92
    {
16
93
        std::lock_guard<std::mutex> lock{mutex};
17
92
        return (*store)[id];
94
        return (*store)[id];
18
93
    }
95
    }
19
94
    catch (std::out_of_range& err)
96
    catch (std::out_of_range& err)
20
95
97
21
=== modified file 'src/server/shell/default_persistent_surface_store.h'
22
--- src/server/shell/default_persistent_surface_store.h	2017-07-28 17:00:43 +0000
23
+++ src/server/shell/default_persistent_surface_store.h	2017-08-14 02:49:35 +0000
24
@@ -20,6 +20,7 @@
25
20
#define MIR_SHELL_DEFAULT_PERSISTENT_SURFACE_STORE_H_
20
#define MIR_SHELL_DEFAULT_PERSISTENT_SURFACE_STORE_H_
26
21
21
27
22
#include "mir/shell/persistent_surface_store.h"
22
#include "mir/shell/persistent_surface_store.h"
28
23
#include <mutex>
29
23
24
30
24
namespace mir
25
namespace mir
31
25
{
26
{
32
@@ -36,6 +37,7 @@
33
36
37
34
37
private:
38
private:
35
38
    class SurfaceIdBimap;
39
    class SurfaceIdBimap;
36
40
    std::mutex mutable mutex;
37
39
    std::unique_ptr<SurfaceIdBimap> const store;
41
    std::unique_ptr<SurfaceIdBimap> const store;
38
40
};
42
};
39
41
}
43
}
Status:	Merged
Approved by:	Alan Griffiths on 2017-08-14
Approved revision:	no longer in the source branch.
Merged at revision:	4226
Proposed branch:	lp:~raof/mir/make-default-surface-store-threadsafe
Merge into:	lp:mir
Diff against target:	39 lines (+4/-0) 2 files modified src/server/shell/default_persistent_surface_store.cpp (+2/-0) src/server/shell/default_persistent_surface_store.h (+2/-0)
To merge this branch:	bzr merge lp:~raof/mir/make-default-surface-store-threadsafe
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alan Griffiths		2017-08-08	Approve on 2017-08-14
Mir CI Bot	continuous-integration		Approve on 2017-08-14
Review via email: mp+328705@code.launchpad.net