1
=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
2
--- tests/integration-tests/test_surfaceloop.cpp	2014-06-12 13:23:29 +0000
3
+++ tests/integration-tests/test_surfaceloop.cpp	2014-06-30 16:11:37 +0000
4
@@ -28,7 +28,6 @@
5
28
#include "mir_test_framework/basic_client_server_fixture.h"
28
#include "mir_test_framework/basic_client_server_fixture.h"
6
29
29
7
30
#include <thread>
30
#include <thread>
8
31
#include <atomic>
9
32
#include <mutex>
31
#include <mutex>
10
33
#include <condition_variable>
32
#include <condition_variable>
11
34
#include <gmock/gmock.h>
33
#include <gmock/gmock.h>
12
@@ -153,17 +152,21 @@
13
153
152
14
154
        CountingStubBuffer()
153
        CountingStubBuffer()
15
155
        {
154
        {
18
156
            int created = buffers_created.load();
155
            std::lock_guard<std::mutex> lock{buffers_mutex};
19
157
            while (!buffers_created.compare_exchange_weak(created, created + 1)) std::this_thread::yield();
156
            ++buffers_created;
20
157
            buffers_cv.notify_one();
21
158
        }
158
        }
22
159
        ~CountingStubBuffer()
159
        ~CountingStubBuffer()
23
160
        {
160
        {
26
161
            int destroyed = buffers_destroyed.load();
161
            std::lock_guard<std::mutex> lock{buffers_mutex};
27
162
            while (!buffers_destroyed.compare_exchange_weak(destroyed, destroyed + 1)) std::this_thread::yield();
162
            ++buffers_destroyed;
28
163
            buffers_cv.notify_one();
29
163
        }
164
        }
30
164
165
33
165
        static std::atomic<int> buffers_created;
166
        static std::mutex buffers_mutex;
34
166
        static std::atomic<int> buffers_destroyed;
167
        static std::condition_variable buffers_cv;
35
168
        static int buffers_created;
36
169
        static int buffers_destroyed;
37
167
    };
170
    };
38
168
171
39
169
    class StubGraphicBufferAllocator : public mtd::StubBufferAllocator
172
    class StubGraphicBufferAllocator : public mtd::StubBufferAllocator
40
@@ -204,8 +207,10 @@
41
204
    std::shared_ptr<mg::Platform> platform;
207
    std::shared_ptr<mg::Platform> platform;
42
205
};
208
};
43
206
209
46
207
std::atomic<int> BufferCounterConfig::CountingStubBuffer::buffers_created;
210
std::mutex BufferCounterConfig::CountingStubBuffer::buffers_mutex;
47
208
std::atomic<int> BufferCounterConfig::CountingStubBuffer::buffers_destroyed;
211
std::condition_variable BufferCounterConfig::CountingStubBuffer::buffers_cv;
48
212
int BufferCounterConfig::CountingStubBuffer::buffers_created;
49
213
int BufferCounterConfig::CountingStubBuffer::buffers_destroyed;
50
209
}
214
}
51
210
215
52
211
struct SurfaceLoop : mtf::BasicClientServerFixture<BufferCounterConfig>
216
struct SurfaceLoop : mtf::BasicClientServerFixture<BufferCounterConfig>
53
@@ -226,8 +231,15 @@
54
226
    {
231
    {
55
227
        mtf::BasicClientServerFixture<BufferCounterConfig>::TearDown();
232
        mtf::BasicClientServerFixture<BufferCounterConfig>::TearDown();
56
228
233
59
229
        EXPECT_EQ(BufferCounterConfig::CountingStubBuffer::buffers_created.load(),
234
        using  Counter = BufferCounterConfig::CountingStubBuffer;
60
230
                  BufferCounterConfig::CountingStubBuffer::buffers_destroyed.load());
235
61
236
        std::chrono::seconds const long_enough{4};
62
237
        auto const all_buffers_destroyed =
63
238
            []{ return Counter::buffers_created == Counter::buffers_destroyed; };
64
239
        std::unique_lock<std::mutex> lock{Counter::buffers_mutex};
65
240
66
241
        EXPECT_TRUE(
67
242
            Counter::buffers_cv.wait_for(lock, long_enough, all_buffers_destroyed));
68
231
    }
243
    }
69
232
};
244
};
70
233
245
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-01
Cemil Azizoglu (community)		2014-06-30	Approve on 2014-07-01
Kevin DuBois (community)			Approve on 2014-06-30
Review via email: mp+225006@code.launchpad.net
1	=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
2	--- tests/integration-tests/test_surfaceloop.cpp 2014-06-12 13:23:29 +0000
3	+++ tests/integration-tests/test_surfaceloop.cpp 2014-06-30 16:11:37 +0000
4	@@ -28,7 +28,6 @@
5	28	#include "mir_test_framework/basic_client_server_fixture.h"	28	#include "mir_test_framework/basic_client_server_fixture.h"
6	29		29
7	30	#include <thread>	30	#include <thread>
8	31	#include <atomic>
9	32	#include <mutex>	31	#include <mutex>
10	33	#include <condition_variable>	32	#include <condition_variable>
11	34	#include <gmock/gmock.h>	33	#include <gmock/gmock.h>
12	@@ -153,17 +152,21 @@
13	153		152
14	154	CountingStubBuffer()	153	CountingStubBuffer()
15	155	{	154	{
18	156	int created = buffers_created.load();	155	std::lock_guard<std::mutex> lock{buffers_mutex};
19	157	while (!buffers_created.compare_exchange_weak(created, created + 1)) std::this_thread::yield();	156	++buffers_created;
20			157	buffers_cv.notify_one();
21	158	}	158	}
22	159	~CountingStubBuffer()	159	~CountingStubBuffer()
23	160	{	160	{
26	161	int destroyed = buffers_destroyed.load();	161	std::lock_guard<std::mutex> lock{buffers_mutex};
27	162	while (!buffers_destroyed.compare_exchange_weak(destroyed, destroyed + 1)) std::this_thread::yield();	162	++buffers_destroyed;
28			163	buffers_cv.notify_one();
29	163	}	164	}
30	164		165
33	165	static std::atomic<int> buffers_created;	166	static std::mutex buffers_mutex;
34	166	static std::atomic<int> buffers_destroyed;	167	static std::condition_variable buffers_cv;
35			168	static int buffers_created;
36			169	static int buffers_destroyed;
37	167	};	170	};
38	168		171
39	169	class StubGraphicBufferAllocator : public mtd::StubBufferAllocator	172	class StubGraphicBufferAllocator : public mtd::StubBufferAllocator
40	@@ -204,8 +207,10 @@
41	204	std::shared_ptr<mg::Platform> platform;	207	std::shared_ptr<mg::Platform> platform;
42	205	};	208	};
43	206		209
46	207	std::atomic<int> BufferCounterConfig::CountingStubBuffer::buffers_created;	210	std::mutex BufferCounterConfig::CountingStubBuffer::buffers_mutex;
47	208	std::atomic<int> BufferCounterConfig::CountingStubBuffer::buffers_destroyed;	211	std::condition_variable BufferCounterConfig::CountingStubBuffer::buffers_cv;
48			212	int BufferCounterConfig::CountingStubBuffer::buffers_created;
49			213	int BufferCounterConfig::CountingStubBuffer::buffers_destroyed;
50	209	}	214	}
51	210		215
52	211	struct SurfaceLoop : mtf::BasicClientServerFixture<BufferCounterConfig>	216	struct SurfaceLoop : mtf::BasicClientServerFixture<BufferCounterConfig>
53	@@ -226,8 +231,15 @@
54	226	{	231	{
55	227	mtf::BasicClientServerFixture<BufferCounterConfig>::TearDown();	232	mtf::BasicClientServerFixture<BufferCounterConfig>::TearDown();
56	228		233
59	229	EXPECT_EQ(BufferCounterConfig::CountingStubBuffer::buffers_created.load(),	234	using Counter = BufferCounterConfig::CountingStubBuffer;
60	230	BufferCounterConfig::CountingStubBuffer::buffers_destroyed.load());	235
61			236	std::chrono::seconds const long_enough{4};
62			237	auto const all_buffers_destroyed =
63			238	[]{ return Counter::buffers_created == Counter::buffers_destroyed; };
64			239	std::unique_lock<std::mutex> lock{Counter::buffers_mutex};
65			240
66			241	EXPECT_TRUE(
67			242	Counter::buffers_cv.wait_for(lock, long_enough, all_buffers_destroyed));
68	231	}	243	}
69	232	};	244	};
70	233		245