1
=== modified file 'tests/acceptance-tests/test_latency.cpp'
2
--- tests/acceptance-tests/test_latency.cpp	2016-01-29 08:18:22 +0000
3
+++ tests/acceptance-tests/test_latency.cpp	2016-02-12 04:13:44 +0000
4
@@ -40,6 +40,7 @@
5
40
namespace
40
namespace
6
41
{
41
{
7
42
42
8
43
unsigned int const expected_client_buffers = 3;
9
43
int const refresh_rate = 60;
44
int const refresh_rate = 60;
10
44
std::chrono::microseconds const vblank_interval(1000000/refresh_rate);
45
std::chrono::microseconds const vblank_interval(1000000/refresh_rate);
11
45
46
12
@@ -69,6 +70,13 @@
13
69
        {
70
        {
14
70
            if (i->buffer_id == submission_id)
71
            if (i->buffer_id == submission_id)
15
71
            {
72
            {
16
73
                // The server is skipping a frame we gave it, which may or
17
74
                // may not be a bug. TODO: investigate.
18
75
                // EXPECT_TRUE(i == submissions.begin());
19
76
                // Fix it up so our stats aren't skewed by the miss:
20
77
                if (i != submissions.begin())
21
78
                    i = submissions.erase(submissions.begin(), i);
22
79
23
72
                latency = post_count - i->time;
80
                latency = post_count - i->time;
24
73
                submissions.erase(i);
81
                submissions.erase(i);
25
74
                break;
82
                break;
26
@@ -151,6 +159,8 @@
27
151
        {
159
        {
28
152
            std::lock_guard<std::mutex> lock{mutex};
160
            std::lock_guard<std::mutex> lock{mutex};
29
153
            latency_list.push_back(latency.value());
161
            latency_list.push_back(latency.value());
30
162
            if (latency.value() > max)
31
163
                max = latency.value();
32
154
        }
164
        }
33
155
165
34
156
        stats.post();
166
        stats.post();
35
@@ -175,9 +185,15 @@
36
175
        return static_cast<float>(sum) / latency_list.size();
185
        return static_cast<float>(sum) / latency_list.size();
37
176
    }
186
    }
38
177
187
39
188
    unsigned int max_latency() const
40
189
    {
41
190
        return max;
42
191
    }
43
192
44
178
private:
193
private:
45
179
    std::mutex mutex;
194
    std::mutex mutex;
47
180
    std::vector<int> latency_list;
195
    std::vector<unsigned int> latency_list;
48
196
    unsigned int max = 0;
49
181
    Stats& stats;
197
    Stats& stats;
50
182
    IdCollectingDB db;
198
    IdCollectingDB db;
51
183
};
199
};
52
@@ -230,8 +246,6 @@
53
230
    ASSERT_TRUE(stats.wait_for_posts(test_submissions,
246
    ASSERT_TRUE(stats.wait_for_posts(test_submissions,
54
231
                                     std::chrono::seconds(60)));
247
                                     std::chrono::seconds(60)));
55
232
248
56
233
    unsigned int const expected_client_buffers = 3;
57
234
58
235
    // Note: Using the "early release" optimization without dynamic queue
249
    // Note: Using the "early release" optimization without dynamic queue
59
236
    //       scaling enabled makes the expected latency possibly up to
250
    //       scaling enabled makes the expected latency possibly up to
60
237
    //       nbuffers instead of nbuffers-1. After dynamic queue scaling is
251
    //       nbuffers instead of nbuffers-1. After dynamic queue scaling is
61
@@ -245,6 +259,24 @@
62
245
    EXPECT_THAT(observed_latency, Lt(expected_max_latency+error_margin));
259
    EXPECT_THAT(observed_latency, Lt(expected_max_latency+error_margin));
63
246
}
260
}
64
247
261
65
262
TEST_F(ClientLatency, latency_is_limited_to_nbuffers)
66
263
{
67
264
    using namespace testing;
68
265
69
266
    auto stream = mir_surface_get_buffer_stream(surface);
70
267
    for(auto i = 0u; i < test_submissions; i++) {
71
268
        auto submission_id = mir_debug_surface_current_buffer_id(surface);
72
269
        stats.record_submission(submission_id);
73
270
        mir_buffer_stream_swap_buffers_sync(stream);
74
271
    }
75
272
76
273
    ASSERT_TRUE(stats.wait_for_posts(test_submissions,
77
274
                                     std::chrono::seconds(60)));
78
275
79
276
    auto max_latency = display.group.max_latency();
80
277
    EXPECT_THAT(max_latency, Le(expected_client_buffers));
81
278
}
82
279
83
248
TEST_F(ClientLatency, throttled_input_rate_yields_lower_latency)
280
TEST_F(ClientLatency, throttled_input_rate_yields_lower_latency)
84
249
{
281
{
85
250
    using namespace testing;
282
    using namespace testing;
Status:	Merged
Approved by:	Daniel van Vugt on 2016-02-12
Approved revision:	no longer in the source branch.
Merged at revision:	3310
Proposed branch:	lp:~vanvugt/mir/fix-ClientLatency-of-5-alt
Merge into:	lp:mir
Diff against target:	85 lines (+35/-3) 1 file modified tests/acceptance-tests/test_latency.cpp (+35/-3)
To merge this branch:	bzr merge lp:~vanvugt/mir/fix-ClientLatency-of-5-alt
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-12
Cemil Azizoglu (community)		2016-02-10	Approve on 2016-02-12
Mir CI Bot	continuous-integration		Approve on 2016-02-12
Alan Griffiths		2016-02-10	Approve on 2016-02-10
Review via email: mp+285558@code.launchpad.net