1
=== modified file 'src/server/compositor/buffer_queue.cpp'
2
--- src/server/compositor/buffer_queue.cpp	2016-02-12 04:02:11 +0000
3
+++ src/server/compositor/buffer_queue.cpp	2016-02-15 08:26:32 +0000
4
@@ -137,7 +137,7 @@
5
137
    graphics::BufferProperties const& props,
137
    graphics::BufferProperties const& props,
6
138
    mc::FrameDroppingPolicyFactory const& policy_provider)
138
    mc::FrameDroppingPolicyFactory const& policy_provider)
7
139
    : nbuffers{nbuffers},
139
    : nbuffers{nbuffers},
9
140
      frame_deadlines_threshold{-1},  // Disable scaling by default
140
      frame_deadlines_threshold{30},  // around half a second to be sure
10
141
      frame_deadlines_met{0},
141
      frame_deadlines_met{0},
11
142
      scheduled_extra_frames{0},
142
      scheduled_extra_frames{0},
12
143
      frame_dropping_enabled{false},
143
      frame_dropping_enabled{false},
13
144
144
14
=== modified file 'tests/acceptance-tests/test_latency.cpp'
15
--- tests/acceptance-tests/test_latency.cpp	2016-02-10 04:27:20 +0000
16
+++ tests/acceptance-tests/test_latency.cpp	2016-02-15 08:26:32 +0000
17
@@ -190,6 +190,15 @@
18
190
        return max;
190
        return max;
19
191
    }
191
    }
20
192
192
21
193
    unsigned int max_latency_from_frame(unsigned int index) const
22
194
    {
23
195
        unsigned int max = 0;
24
196
        for (auto i = index; i < latency_list.size(); ++i)
25
197
            if (latency_list[i] > max)
26
198
                max = latency_list[i];
27
199
        return max;
28
200
    }
29
201
30
193
private:
202
private:
31
194
    std::mutex mutex;
203
    std::mutex mutex;
32
195
    std::vector<unsigned int> latency_list;
204
    std::vector<unsigned int> latency_list;
33
@@ -246,12 +255,10 @@
34
246
    ASSERT_TRUE(stats.wait_for_posts(test_submissions,
255
    ASSERT_TRUE(stats.wait_for_posts(test_submissions,
35
247
                                     std::chrono::seconds(60)));
256
                                     std::chrono::seconds(60)));
36
248
257
43
249
    // Note: Using the "early release" optimization without dynamic queue
258
    // This is to verify the server is performing as expected:
44
250
    //       scaling enabled makes the expected latency possibly up to
259
    float const expected_max_latency = expected_client_buffers - 1;
45
251
    //       nbuffers instead of nbuffers-1. After dynamic queue scaling is
260
    // and this is just a sanity check that the test itself isn't broken:
46
252
    //       enabled, the average will be lower than this.
261
    float const expected_min_latency = 1;
41
253
    float const expected_max_latency = expected_client_buffers;
42
254
    float const expected_min_latency = expected_client_buffers - 1;
47
255
262
48
256
    auto observed_latency = display.group.average_latency();
263
    auto observed_latency = display.group.average_latency();
49
257
264
50
@@ -259,6 +266,44 @@
51
259
    EXPECT_THAT(observed_latency, Lt(expected_max_latency+error_margin));
266
    EXPECT_THAT(observed_latency, Lt(expected_max_latency+error_margin));
52
260
}
267
}
53
261
268
54
269
TEST_F(ClientLatency, latency_scales_down_for_a_smooth_client)
55
270
{
56
271
    using namespace testing;
57
272
58
273
    auto stream = mir_surface_get_buffer_stream(surface);
59
274
    for(auto i = 0u; i < test_submissions; i++) {
60
275
        auto submission_id = mir_debug_surface_current_buffer_id(surface);
61
276
        stats.record_submission(submission_id);
62
277
        mir_buffer_stream_swap_buffers_sync(stream);
63
278
    }
64
279
65
280
    ASSERT_TRUE(stats.wait_for_posts(test_submissions,
66
281
                                     std::chrono::seconds(60)));
67
282
68
283
    EXPECT_THAT(display.group.max_latency_from_frame(50), Le(1));
69
284
}
70
285
71
286
TEST_F(ClientLatency, latency_doesnt_scale_down_for_a_stuttery_client)
72
287
{
73
288
    using namespace testing;
74
289
75
290
    auto stream = mir_surface_get_buffer_stream(surface);
76
291
    for(auto i = 0u; i < test_submissions; i++) {
77
292
        auto submission_id = mir_debug_surface_current_buffer_id(surface);
78
293
        stats.record_submission(submission_id);
79
294
        mir_buffer_stream_swap_buffers_sync(stream);
80
295
81
296
        // Stutter
82
297
        if (i % 10 == 0)
83
298
            std::this_thread::sleep_for(vblank_interval * 2);
84
299
    }
85
300
86
301
    ASSERT_TRUE(stats.wait_for_posts(test_submissions,
87
302
                                     std::chrono::seconds(60)));
88
303
89
304
    EXPECT_THAT(display.group.max_latency_from_frame(50), Ge(2));
90
305
}
91
306
92
262
TEST_F(ClientLatency, latency_is_limited_to_nbuffers)
307
TEST_F(ClientLatency, latency_is_limited_to_nbuffers)
93
263
{
308
{
94
264
    using namespace testing;
309
    using namespace testing;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-15
Mir CI Bot	continuous-integration		Approve on 2016-02-15
Daniel van Vugt			Needs Information on 2016-02-15
Kevin DuBois (community)		2016-02-04	Abstain on 2016-02-04
Review via email: mp+285031@code.launchpad.net