1
=== modified file 'tests/unit-tests/compositor/test_buffer_queue.cpp'
2
--- tests/unit-tests/compositor/test_buffer_queue.cpp	2014-06-03 02:13:59 +0000
3
+++ tests/unit-tests/compositor/test_buffer_queue.cpp	2014-06-05 10:46:20 +0000
4
@@ -1269,11 +1269,14 @@
5
1269
1269
6
1270
TEST_F(BufferQueueTest, compositor_never_owns_client_buffers)
1270
TEST_F(BufferQueueTest, compositor_never_owns_client_buffers)
7
1271
{
1271
{
8
1272
    static std::chrono::nanoseconds const time_for_client_to_acquire{1};
9
1273
10
1272
    for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
1274
    for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
11
1273
    {
1275
    {
12
1274
        mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);
1276
        mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);
13
1275
1277
14
1276
        std::mutex client_buffer_guard;
1278
        std::mutex client_buffer_guard;
15
1279
        std::condition_variable client_buffer_cv;
16
1277
        mg::Buffer* client_buffer = nullptr;
1280
        mg::Buffer* client_buffer = nullptr;
17
1278
        std::atomic<bool> done(false);
1281
        std::atomic<bool> done(false);
18
1279
1282
19
@@ -1285,9 +1288,15 @@
20
1285
                auto buffer = q.compositor_acquire(this);
1288
                auto buffer = q.compositor_acquire(this);
21
1286
1289
22
1287
                {
1290
                {
25
1288
                    std::lock_guard<std::mutex> lock(client_buffer_guard);
1291
                    std::unique_lock<std::mutex> lock(client_buffer_guard);
26
1289
                    if (client_buffer)
1292
27
1293
                    if (client_buffer_cv.wait_for(
28
1294
                        lock,
29
1295
                        time_for_client_to_acquire,
30
1296
                        [&]()->bool{ return client_buffer; }))
31
1297
                    {
32
1290
                        ASSERT_THAT(buffer->id(), Ne(client_buffer->id()));
1298
                        ASSERT_THAT(buffer->id(), Ne(client_buffer->id()));
33
1299
                    }
34
1291
                }
1300
                }
35
1292
1301
36
1293
                std::this_thread::yield();
1302
                std::this_thread::yield();
37
@@ -1304,6 +1313,7 @@
38
1304
            {
1313
            {
39
1305
                std::lock_guard<std::mutex> lock(client_buffer_guard);
1314
                std::lock_guard<std::mutex> lock(client_buffer_guard);
40
1306
                client_buffer = handle->buffer();
1315
                client_buffer = handle->buffer();
41
1316
                client_buffer_cv.notify_one();
42
1307
            }
1317
            }
43
1308
1318
44
1309
            std::this_thread::yield();
1319
            std::this_thread::yield();
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-06-06
Alexandros Frantzis (community)			Approve on 2014-06-06
Kevin DuBois (community)			Approve on 2014-06-06
Alberto Aguirre (community)		2014-06-05	Approve on 2014-06-05
Review via email: mp+222157@code.launchpad.net
1	=== modified file 'tests/unit-tests/compositor/test_buffer_queue.cpp'
2	--- tests/unit-tests/compositor/test_buffer_queue.cpp 2014-06-03 02:13:59 +0000
3	+++ tests/unit-tests/compositor/test_buffer_queue.cpp 2014-06-05 10:46:20 +0000
4	@@ -1269,11 +1269,14 @@
5	1269		1269
6	1270	TEST_F(BufferQueueTest, compositor_never_owns_client_buffers)	1270	TEST_F(BufferQueueTest, compositor_never_owns_client_buffers)
7	1271	{	1271	{
8			1272	static std::chrono::nanoseconds const time_for_client_to_acquire{1};
9			1273
10	1272	for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)	1274	for (int nbuffers = 2; nbuffers <= max_nbuffers_to_test; ++nbuffers)
11	1273	{	1275	{
12	1274	mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);	1276	mc::BufferQueue q(nbuffers, allocator, basic_properties, policy_factory);
13	1275		1277
14	1276	std::mutex client_buffer_guard;	1278	std::mutex client_buffer_guard;
15			1279	std::condition_variable client_buffer_cv;
16	1277	mg::Buffer* client_buffer = nullptr;	1280	mg::Buffer* client_buffer = nullptr;
17	1278	std::atomic<bool> done(false);	1281	std::atomic<bool> done(false);
18	1279		1282
19	@@ -1285,9 +1288,15 @@
20	1285	auto buffer = q.compositor_acquire(this);	1288	auto buffer = q.compositor_acquire(this);
21	1286		1289
22	1287	{	1290	{
25	1288	std::lock_guard<std::mutex> lock(client_buffer_guard);	1291	std::unique_lock<std::mutex> lock(client_buffer_guard);
26	1289	if (client_buffer)	1292
27			1293	if (client_buffer_cv.wait_for(
28			1294	lock,
29			1295	time_for_client_to_acquire,
30			1296	[&]()->bool{ return client_buffer; }))
31			1297	{
32	1290	ASSERT_THAT(buffer->id(), Ne(client_buffer->id()));	1298	ASSERT_THAT(buffer->id(), Ne(client_buffer->id()));
33			1299	}
34	1291	}	1300	}
35	1292		1301
36	1293	std::this_thread::yield();	1302	std::this_thread::yield();
37	@@ -1304,6 +1313,7 @@
38	1304	{	1313	{
39	1305	std::lock_guard<std::mutex> lock(client_buffer_guard);	1314	std::lock_guard<std::mutex> lock(client_buffer_guard);
40	1306	client_buffer = handle->buffer();	1315	client_buffer = handle->buffer();
41			1316	client_buffer_cv.notify_one();
42	1307	}	1317	}
43	1308		1318
44	1309	std::this_thread::yield();	1319	std::this_thread::yield();