1
=== modified file 'src/server/compositor/switching_bundle.cpp'
2
--- src/server/compositor/switching_bundle.cpp	2014-04-15 05:31:19 +0000
3
+++ src/server/compositor/switching_bundle.cpp	2014-05-05 04:09:18 +0000
4
@@ -205,10 +205,10 @@
5
205
    return nfree() >= min_free;
205
    return nfree() >= min_free;
6
206
}
206
}
7
207
207
9
208
void mc::SwitchingBundle::client_acquire(std::function<void(graphics::Buffer* buffer)> complete)
208
void mc::SwitchingBundle::client_acquire(Callback complete)
10
209
{
209
{
11
210
    std::unique_lock<std::mutex> lock(guard);
210
    std::unique_lock<std::mutex> lock(guard);
13
211
    client_acquire_todo = std::move(complete);
211
    client_acquires_todo.push_back(std::move(complete));
14
212
212
15
213
    if ((framedropping || force_drop) && nbuffers > 1)
213
    if ((framedropping || force_drop) && nbuffers > 1)
16
214
    {
214
    {
17
@@ -230,7 +230,8 @@
18
230
230
19
231
void mc::SwitchingBundle::complete_client_acquire(std::unique_lock<std::mutex> lock)
231
void mc::SwitchingBundle::complete_client_acquire(std::unique_lock<std::mutex> lock)
20
232
{
232
{
22
233
    auto complete = std::move(client_acquire_todo);
233
    auto complete = std::move(client_acquires_todo.front());
23
234
    client_acquires_todo.pop_front();
24
234
235
25
235
    if ((framedropping || force_drop) && nbuffers > 1)
236
    if ((framedropping || force_drop) && nbuffers > 1)
26
236
    {
237
    {
27
@@ -381,8 +382,10 @@
28
381
            ncompositors--;
382
            ncompositors--;
29
382
        }
383
        }
30
383
384
32
384
        if (client_buffers_available(lock) && client_acquire_todo)
385
        if (client_buffers_available(lock) && !client_acquires_todo.empty())
33
386
        {
34
385
            complete_client_acquire(std::move(lock));
387
            complete_client_acquire(std::move(lock));
35
388
        }
36
386
    }
389
    }
37
387
}
390
}
38
388
391
39
@@ -435,7 +438,7 @@
40
435
void mc::SwitchingBundle::force_requests_to_complete()
438
void mc::SwitchingBundle::force_requests_to_complete()
41
436
{
439
{
42
437
    std::unique_lock<std::mutex> lock(guard);
440
    std::unique_lock<std::mutex> lock(guard);
44
438
    if (client_acquire_todo)
441
    if (!client_acquires_todo.empty())
45
439
    {
442
    {
46
440
        drop_frames(nready);
443
        drop_frames(nready);
47
441
        force_drop = nbuffers + 1;
444
        force_drop = nbuffers + 1;
48
442
445
49
=== modified file 'src/server/compositor/switching_bundle.h'
50
--- src/server/compositor/switching_bundle.h	2014-03-26 05:48:59 +0000
51
+++ src/server/compositor/switching_bundle.h	2014-05-05 04:09:18 +0000
52
@@ -26,6 +26,7 @@
53
26
#include <memory>
26
#include <memory>
54
27
#include <iosfwd>
27
#include <iosfwd>
55
28
#include <unordered_set>
28
#include <unordered_set>
56
29
#include <deque>
57
29
30
58
30
namespace mir
31
namespace mir
59
31
{
32
{
60
@@ -41,6 +42,7 @@
61
41
{
42
{
62
42
public:
43
public:
63
43
    enum {min_buffers = 1, max_buffers = 5};
44
    enum {min_buffers = 1, max_buffers = 5};
64
45
    typedef std::function<void(graphics::Buffer* buffer)> Callback;
65
44
46
66
45
    SwitchingBundle(int nbuffers,
47
    SwitchingBundle(int nbuffers,
67
46
                    const std::shared_ptr<graphics::GraphicBufferAllocator> &,
48
                    const std::shared_ptr<graphics::GraphicBufferAllocator> &,
68
@@ -50,7 +52,7 @@
69
50
52
70
51
    graphics::BufferProperties properties() const;
53
    graphics::BufferProperties properties() const;
71
52
54
73
53
    void client_acquire(std::function<void(graphics::Buffer* buffer)> complete) override;
55
    void client_acquire(Callback complete) override;
74
54
    void client_release(graphics::Buffer* buffer);
56
    void client_release(graphics::Buffer* buffer);
75
55
    std::shared_ptr<graphics::Buffer>
57
    std::shared_ptr<graphics::Buffer>
76
56
        compositor_acquire(void const* user_id) override;
58
        compositor_acquire(void const* user_id) override;
77
@@ -111,7 +113,7 @@
78
111
    bool framedropping;
113
    bool framedropping;
79
112
    int force_drop;
114
    int force_drop;
80
113
115
82
114
    std::function<void(graphics::Buffer* buffer)> client_acquire_todo;
116
    std::deque<Callback> client_acquires_todo;
83
115
117
84
116
    friend std::ostream& operator<<(std::ostream& os, const SwitchingBundle& bundle);
118
    friend std::ostream& operator<<(std::ostream& os, const SwitchingBundle& bundle);
85
117
};
119
};
86
118
120
87
=== modified file 'tests/unit-tests/compositor/test_switching_bundle.cpp'
88
--- tests/unit-tests/compositor/test_switching_bundle.cpp	2014-04-15 05:31:19 +0000
89
+++ tests/unit-tests/compositor/test_switching_bundle.cpp	2014-05-05 04:09:18 +0000
90
@@ -254,6 +254,37 @@
91
254
    }
254
    }
92
255
}
255
}
93
256
256
94
257
TEST_F(SwitchingBundleTest, clients_can_acquire_multiple_buffers)
95
258
{   // Regression test for LP: #1315302
96
259
    int const nbuffers = 3;
97
260
    mc::SwitchingBundle bundle(nbuffers, allocator, basic_properties);
98
261
99
262
    for (int i = 0; i < nbuffers; ++i)
100
263
        bundle.client_release(client_acquire_blocking(bundle));
101
264
102
265
    mg::Buffer* acquired1 = nullptr;
103
266
    bundle.client_acquire([&](mg::Buffer* buffer)
104
267
        {
105
268
            acquired1 = buffer;
106
269
        });
107
270
108
271
    mg::Buffer* acquired2 = nullptr;
109
272
    bundle.client_acquire([&](mg::Buffer* buffer)
110
273
        {
111
274
            acquired2 = buffer;
112
275
        });
113
276
114
277
    for (int i = 0; i < nbuffers+2; ++i)
115
278
        bundle.compositor_release(bundle.compositor_acquire(this));
116
279
117
280
    EXPECT_NE(acquired1, acquired2);
118
281
    ASSERT_NE(nullptr, acquired2);
119
282
    ASSERT_NE(nullptr, acquired1);
120
283
121
284
    bundle.client_release(acquired1);
122
285
    bundle.client_release(acquired2);
123
286
}
124
287
125
257
TEST_F(SwitchingBundleTest, compositor_acquire_basic)
288
TEST_F(SwitchingBundleTest, compositor_acquire_basic)
126
258
{
289
{
127
259
    for (int nbuffers = mc::SwitchingBundle::min_buffers;
290
    for (int nbuffers = mc::SwitchingBundle::min_buffers;
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Needs Fixing on 2014-05-06
Robert Carr (community)			Approve on 2014-05-05
Alexandros Frantzis (community)		2014-05-02	Approve on 2014-05-05
PS Jenkins bot (community)	continuous-integration		Approve on 2014-05-05
Review via email: mp+218029@code.launchpad.net