1
=== modified file 'tests/acceptance-tests/test_latency.cpp'
2
--- tests/acceptance-tests/test_latency.cpp	2016-10-12 06:03:15 +0000
3
+++ tests/acceptance-tests/test_latency.cpp	2016-10-21 07:54:20 +0000
4
@@ -69,7 +69,7 @@
5
69
69
6
70
        mir::optional_value<unsigned int> latency;
70
        mir::optional_value<unsigned int> latency;
7
71
71
9
72
        for (auto i = submissions.begin(); i != submissions.end(); i++)
72
        for (auto i = submissions.begin(); i != submissions.end();)
10
73
        {
73
        {
11
74
            if (i->buffer_id == submission_id)
74
            if (i->buffer_id == submission_id)
12
75
            {
75
            {
13
@@ -81,8 +81,14 @@
14
81
                    i = submissions.erase(submissions.begin(), i);
81
                    i = submissions.erase(submissions.begin(), i);
15
82
82
16
83
                latency = visible_frame - i->visible_frame_when_submitted;
83
                latency = visible_frame - i->visible_frame_when_submitted;
19
84
                submissions.erase(i);
84
                i = submissions.erase(i);
20
85
                break;
85
                if (swap_interval > 0)
21
86
                    break;
22
87
                //else for interval zero delete dropped entries and use last
23
88
            }
24
89
            else
25
90
            {
26
91
                i++;
27
86
            }
92
            }
28
87
        }
93
        }
29
88
94
30
@@ -101,6 +107,8 @@
31
101
        return true;
107
        return true;
32
102
    }
108
    }
33
103
109
34
110
    unsigned int swap_interval{1};
35
111
36
104
private:
112
private:
37
105
    std::mutex mutex;
113
    std::mutex mutex;
38
106
    std::condition_variable posted;
114
    std::condition_variable posted;
39
@@ -250,6 +258,8 @@
40
250
            del);
258
            del);
41
251
        visible_surface = std::make_unique<mtf::VisibleSurface>(spec.get());
259
        visible_surface = std::make_unique<mtf::VisibleSurface>(spec.get());
42
252
        surface =  *visible_surface;
260
        surface =  *visible_surface;
43
261
44
262
        stats.swap_interval = 1;
45
253
    }
263
    }
46
254
264
47
255
    void TearDown() override
265
    void TearDown() override
48
@@ -312,6 +322,28 @@
49
312
    EXPECT_THAT(max_latency, Le(expected_client_buffers));
322
    EXPECT_THAT(max_latency, Le(expected_client_buffers));
50
313
}
323
}
51
314
324
52
325
TEST_F(ClientLatency, dropping_latency_is_limited_to_one)
53
326
{
54
327
    using namespace testing;
55
328
56
329
    auto stream = mir_surface_get_buffer_stream(surface);
57
330
    mir_buffer_stream_set_swapinterval(stream, 0);
58
331
    stats.swap_interval = 0;
59
332
60
333
    do
61
334
    {
62
335
        auto submission_id = mir_debug_surface_current_buffer_id(surface);
63
336
        stats.record_submission(submission_id);
64
337
        mir_buffer_stream_swap_buffers_sync(stream);
65
338
    } while (!stats.wait_for_posts(test_submissions, std::chrono::seconds(0)));
66
339
67
340
    auto max_latency = display.group.max_latency();
68
341
    EXPECT_THAT(max_latency, Le(1u));
69
342
70
343
    if (server.get_options()->get<bool>(mtd::logging_opt))
71
344
        display.group.dump_latency();
72
345
}
73
346
74
315
TEST_F(ClientLatency, throttled_input_rate_yields_lower_latency)
347
TEST_F(ClientLatency, throttled_input_rate_yields_lower_latency)
75
316
{
348
{
76
317
    using namespace testing;
349
    using namespace testing;
Status:	Merged
Merged at revision:	3788
Proposed branch:	lp:~vanvugt/mir/test-dropping-latency
Merge into:	lp:mir
Diff against target:	76 lines (+35/-3) 1 file modified tests/acceptance-tests/test_latency.cpp (+35/-3)
To merge this branch:	bzr merge lp:~vanvugt/mir/test-dropping-latency
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2016-10-26
Cemil Azizoglu (community)		2016-10-19	Approve on 2016-10-20
Review via email: mp+308839@code.launchpad.net
1	=== modified file 'tests/acceptance-tests/test_latency.cpp'
2	--- tests/acceptance-tests/test_latency.cpp 2016-10-12 06:03:15 +0000
3	+++ tests/acceptance-tests/test_latency.cpp 2016-10-21 07:54:20 +0000
4	@@ -69,7 +69,7 @@
5	69		69
6	70	mir::optional_value<unsigned int> latency;	70	mir::optional_value<unsigned int> latency;
7	71		71
9	72	for (auto i = submissions.begin(); i != submissions.end(); i++)	72	for (auto i = submissions.begin(); i != submissions.end();)
10	73	{	73	{
11	74	if (i->buffer_id == submission_id)	74	if (i->buffer_id == submission_id)
12	75	{	75	{
13	@@ -81,8 +81,14 @@
14	81	i = submissions.erase(submissions.begin(), i);	81	i = submissions.erase(submissions.begin(), i);
15	82		82
16	83	latency = visible_frame - i->visible_frame_when_submitted;	83	latency = visible_frame - i->visible_frame_when_submitted;
19	84	submissions.erase(i);	84	i = submissions.erase(i);
20	85	break;	85	if (swap_interval > 0)
21			86	break;
22			87	//else for interval zero delete dropped entries and use last
23			88	}
24			89	else
25			90	{
26			91	i++;
27	86	}	92	}
28	87	}	93	}
29	88		94
30	@@ -101,6 +107,8 @@
31	101	return true;	107	return true;
32	102	}	108	}
33	103		109
34			110	unsigned int swap_interval{1};
35			111
36	104	private:	112	private:
37	105	std::mutex mutex;	113	std::mutex mutex;
38	106	std::condition_variable posted;	114	std::condition_variable posted;
39	@@ -250,6 +258,8 @@
40	250	del);	258	del);
41	251	visible_surface = std::make_unique<mtf::VisibleSurface>(spec.get());	259	visible_surface = std::make_unique<mtf::VisibleSurface>(spec.get());
42	252	surface = *visible_surface;	260	surface = *visible_surface;
43			261
44			262	stats.swap_interval = 1;
45	253	}	263	}
46	254		264
47	255	void TearDown() override	265	void TearDown() override
48	@@ -312,6 +322,28 @@
49	312	EXPECT_THAT(max_latency, Le(expected_client_buffers));	322	EXPECT_THAT(max_latency, Le(expected_client_buffers));
50	313	}	323	}
51	314		324
52			325	TEST_F(ClientLatency, dropping_latency_is_limited_to_one)
53			326	{
54			327	using namespace testing;
55			328
56			329	auto stream = mir_surface_get_buffer_stream(surface);
57			330	mir_buffer_stream_set_swapinterval(stream, 0);
58			331	stats.swap_interval = 0;
59			332
60			333	do
61			334	{
62			335	auto submission_id = mir_debug_surface_current_buffer_id(surface);
63			336	stats.record_submission(submission_id);
64			337	mir_buffer_stream_swap_buffers_sync(stream);
65			338	} while (!stats.wait_for_posts(test_submissions, std::chrono::seconds(0)));
66			339
67			340	auto max_latency = display.group.max_latency();
68			341	EXPECT_THAT(max_latency, Le(1u));
69			342
70			343	if (server.get_options()->get<bool>(mtd::logging_opt))
71			344	display.group.dump_latency();
72			345	}
73			346
74	315	TEST_F(ClientLatency, throttled_input_rate_yields_lower_latency)	347	TEST_F(ClientLatency, throttled_input_rate_yields_lower_latency)
75	316	{	348	{
76	317	using namespace testing;	349	using namespace testing;