Merge into development-branch : remove-never-used-code : Code : Mir

Status:

Merged

Approved by:

Alan Griffiths on 2017-05-25

Approved revision:

no longer in the source branch.

Merged at revision:

4175

Proposed branch:

lp:~raof/mir/remove-never-used-code

Merge into:

lp:mir

Prerequisite:

lp:~raof/mir/the-compiler-warning-treadmill

Diff against target:

219 lines (+11/-45)

7 files modified

src/server/compositor/buffer_acquisition.h (+0/-7)
src/server/compositor/multi_monitor_arbiter.cpp (+2/-11)
src/server/compositor/multi_monitor_arbiter.h (+0/-3)
src/server/compositor/stream.cpp (+1/-2)
tests/integration-tests/test_buffer_scheduling.cpp (+0/-2)
tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp (+8/-19)
tests/unit-tests/compositor/test_temporary_buffers.cpp (+0/-1)

To merge this branch:

bzr merge lp:~raof/mir/remove-never-used-code

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-05-25
Alan Griffiths		2017-05-25	Approve on 2017-05-25
Review via email: mp+324594@code.launchpad.net

Commit message

mc::BufferAcquisition: Remove the never-used MultiMonitorMode enum.

We've got code for both versions, but single_monitor_fast has never been used, and is
not exposed to external users.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-05-25:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3410/rebuild

review: Approve (continuous-integration)

Revision history for this message

Alan Griffiths (alan-griffiths) wrote on 2017-05-25:

#

LFTM

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-05-25:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-05-25:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-05-25:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3417/rebuild

FAILED: Continuous integration, rev:4181
https://mir-jenkins.ubuntu.com/job/mir-ci/3417/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4648/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4781
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4771
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4683
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4683/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4683/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4683
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4683/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4683/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4683
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4683/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4683
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4683/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4683
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4683/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4683/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3417/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) on 2017-05-25:

#

review: Approve (continuous-integration)

Mir

Merge lp:~raof/mir/remove-never-used-code into lp:mir

Commit message

Description of the change

Preview Diff

Subscribers

1	=== modified file 'src/server/compositor/buffer_acquisition.h'
2	--- src/server/compositor/buffer_acquisition.h 2017-05-08 03:04:26 +0000
3	+++ src/server/compositor/buffer_acquisition.h 2017-05-25 05:52:50 +0000
4	@@ -30,12 +30,6 @@
5	namespace compositor
6	{
7
8	-enum class MultiMonitorMode
9	-{
10	- multi_monitor_sync, // lower latency+framerate, and supports multi-monitor
11	- single_monitor_fast // higher latency+framerate, no multi-monitor
12	-};
13	-
14	class BufferAcquisition
15	{
16	public:
17	@@ -55,7 +49,6 @@
18	virtual void compositor_release(std::shared_ptr<graphics::Buffer> const&) = 0;
19	virtual std::shared_ptr<graphics::Buffer> snapshot_acquire() = 0;
20	virtual void snapshot_release(std::shared_ptr<graphics::Buffer> const&) = 0;
21	- virtual void set_mode(MultiMonitorMode mode) = 0;
22	virtual ~BufferAcquisition() = default;
23
24	protected:
25
26	=== modified file 'src/server/compositor/multi_monitor_arbiter.cpp'
27	--- src/server/compositor/multi_monitor_arbiter.cpp 2017-05-08 03:04:26 +0000
28	+++ src/server/compositor/multi_monitor_arbiter.cpp 2017-05-25 05:52:50 +0000
29	@@ -30,10 +30,8 @@
30	namespace mf = mir::frontend;
31
32	mc::MultiMonitorArbiter::MultiMonitorArbiter(
33	- MultiMonitorMode mode,
34	std::shared_ptr<frontend::ClientBuffers> const& map,
35	std::shared_ptr<Schedule> const& schedule) :
36	- mode(mode),
37	map(map),
38	schedule(schedule)
39	{
40	@@ -68,8 +66,7 @@
41	auto& last_entry = onscreen_buffers.front();
42	last_entry.use_count++;
43	auto last_entry_buffer = last_entry.buffer;
44	- if (mode == mc::MultiMonitorMode::multi_monitor_sync)
45	- clean_onscreen_buffers(lk);
46	+ clean_onscreen_buffers(lk);
47	return last_entry_buffer;
48	}
49
50	@@ -79,7 +76,7 @@
51
52	decrease_refcount_for(buffer->id(), lk);
53
54	- if ((mode == mc::MultiMonitorMode::single_monitor_fast) \|\| (onscreen_buffers.begin()->buffer != buffer))
55	+ if (onscreen_buffers.begin()->buffer != buffer)
56	clean_onscreen_buffers(lk);
57	}
58
59	@@ -140,12 +137,6 @@
60	schedule = new_schedule;
61	}
62
63	-void mc::MultiMonitorArbiter::set_mode(MultiMonitorMode new_mode)
64	-{
65	- std::lock_guard<decltype(mutex)> lk(mutex);
66	- mode = new_mode;
67	-}
68	-
69	bool mc::MultiMonitorArbiter::buffer_ready_for(mc::CompositorID id)
70	{
71	std::lock_guard<decltype(mutex)> lk(mutex);
72
73	=== modified file 'src/server/compositor/multi_monitor_arbiter.h'
74	--- src/server/compositor/multi_monitor_arbiter.h 2017-05-08 03:04:26 +0000
75	+++ src/server/compositor/multi_monitor_arbiter.h 2017-05-25 05:52:50 +0000
76	@@ -38,7 +38,6 @@
77	{
78	public:
79	MultiMonitorArbiter(
80	- MultiMonitorMode mode,
81	std::shared_ptr<frontend::ClientBuffers> const& map,
82	std::shared_ptr<Schedule> const& schedule);
83	~MultiMonitorArbiter();
84	@@ -48,7 +47,6 @@
85	std::shared_ptr<graphics::Buffer> snapshot_acquire() override;
86	void snapshot_release(std::shared_ptr<graphics::Buffer> const&) override;
87	void set_schedule(std::shared_ptr<Schedule> const& schedule);
88	- void set_mode(MultiMonitorMode mode) override;
89	bool buffer_ready_for(compositor::CompositorID id);
90	bool has_buffer();
91	void advance_schedule();
92	@@ -58,7 +56,6 @@
93	void clean_onscreen_buffers(std::lock_guard<std::mutex> const&);
94
95	std::mutex mutable mutex;
96	- MultiMonitorMode mode;
97	std::shared_ptr<frontend::ClientBuffers> const map;
98	struct ScheduleEntry
99	{
100
101	=== modified file 'src/server/compositor/stream.cpp'
102	--- src/server/compositor/stream.cpp 2017-05-22 16:48:15 +0000
103	+++ src/server/compositor/stream.cpp 2017-05-25 05:52:50 +0000
104	@@ -41,8 +41,7 @@
105	schedule_mode(ScheduleMode::Queueing),
106	schedule(std::make_shared<mc::QueueingSchedule>()),
107	buffers(map),
108	- arbiter(std::make_shared<mc::MultiMonitorArbiter>(
109	- mc::MultiMonitorMode::multi_monitor_sync, buffers, schedule)),
110	+ arbiter(std::make_shared<mc::MultiMonitorArbiter>(buffers, schedule)),
111	size(size),
112	pf(pf),
113	first_frame_posted(false)
114
115	=== modified file 'tests/integration-tests/test_buffer_scheduling.cpp'
116	--- tests/integration-tests/test_buffer_scheduling.cpp 2017-05-08 03:04:26 +0000
117	+++ tests/integration-tests/test_buffer_scheduling.cpp 2017-05-25 05:52:50 +0000
118	@@ -822,8 +822,6 @@
119	ASSERT_FALSE(producer->can_produce());
120
121	onscreen.reset();
122	- // single_monitor_fast -> can produce here
123	- // multi_monitor_sync -> can't produce here
124	ASSERT_FALSE(producer->can_produce());
125	}
126
127
128	=== modified file 'tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp'
129	--- tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp 2017-05-08 03:04:26 +0000
130	+++ tests/unit-tests/compositor/test_multi_monitor_arbiter.cpp 2017-05-25 05:52:50 +0000
131	@@ -75,9 +75,9 @@
132	std::vector<std::shared_ptr<mg::Buffer>> sched;
133	};
134
135	-struct MultiMonitorArbiterBase : Test
136	+struct MultiMonitorArbiter : Test
137	{
138	- MultiMonitorArbiterBase()
139	+ MultiMonitorArbiter()
140	{
141	for(auto i = 0u; i < num_buffers; i++)
142	buffers.emplace_back(std::make_shared<mtd::StubBuffer>());
143	@@ -86,18 +86,7 @@
144	std::vector<std::shared_ptr<mg::Buffer>> buffers;
145	NiceMock<MockBufferMap> mock_map;
146	FixedSchedule schedule;
147	-};
148	-
149	-struct MultiMonitorArbiter : MultiMonitorArbiterBase
150	-{
151	- mc::MultiMonitorMode guarantee{mc::MultiMonitorMode::multi_monitor_sync};
152	- mc::MultiMonitorArbiter arbiter{guarantee, mt::fake_shared(mock_map), mt::fake_shared(schedule)};
153	-};
154	-
155	-struct MultiMonitorArbiterWithAnyFrameGuarantee : MultiMonitorArbiterBase
156	-{
157	- mc::MultiMonitorMode guarantee{mc::MultiMonitorMode::single_monitor_fast};
158	- mc::MultiMonitorArbiter arbiter{guarantee, mt::fake_shared(mock_map), mt::fake_shared(schedule)};
159	+ mc::MultiMonitorArbiter arbiter{mt::fake_shared(mock_map), mt::fake_shared(schedule)};
160	};
161	}
162
163	@@ -121,7 +110,7 @@
164	EXPECT_THAT(cbuffer, Eq(buffers[0]));
165	}
166
167	-TEST_F(MultiMonitorArbiterWithAnyFrameGuarantee, compositor_release_sends_buffer_back_with_any_monitor_guarantee)
168	+TEST_F(MultiMonitorArbiter, compositor_release_sends_buffer_back)
169	{
170	EXPECT_CALL(mock_map, send_buffer(buffers[0]->id()));
171
172	@@ -132,7 +121,7 @@
173	arbiter.compositor_release(cbuffer);
174	}
175
176	-TEST_F(MultiMonitorArbiterWithAnyFrameGuarantee, compositor_can_acquire_different_buffers)
177	+TEST_F(MultiMonitorArbiter, compositor_can_acquire_different_buffers)
178	{
179	EXPECT_CALL(mock_map, send_buffer(buffers[0]->id()));
180
181	@@ -146,7 +135,7 @@
182	Mock::VerifyAndClearExpectations(&mock_map);
183	}
184
185	-TEST_F(MultiMonitorArbiterWithAnyFrameGuarantee, compositor_buffer_syncs_to_fastest_compositor)
186	+TEST_F(MultiMonitorArbiter, compositor_buffer_syncs_to_fastest_compositor)
187	{
188	int comp_id1{0};
189	int comp_id2{0};
190	@@ -333,7 +322,7 @@
191	arbiter.snapshot_release(sbuffer1);
192	}
193
194	-TEST_F(MultiMonitorArbiterWithAnyFrameGuarantee, compositor_can_acquire_a_few_times_and_only_sends_on_the_last_release)
195	+TEST_F(MultiMonitorArbiter, compositor_can_acquire_a_few_times_and_only_sends_on_the_last_release)
196	{
197	int comp_id1{0};
198	int comp_id2{0};
199	@@ -558,7 +547,7 @@
200
201	TEST_F(MultiMonitorArbiter, releases_buffer_on_destruction)
202	{
203	- mc::MultiMonitorArbiter arbiter{guarantee, mt::fake_shared(mock_map), mt::fake_shared(schedule)};
204	+ mc::MultiMonitorArbiter arbiter{mt::fake_shared(mock_map), mt::fake_shared(schedule)};
205	EXPECT_CALL(mock_map, send_buffer(buffers[0]->id()));
206	schedule.set_schedule({buffers[0]});
207	arbiter.advance_schedule();
208
209	=== modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp'
210	--- tests/unit-tests/compositor/test_temporary_buffers.cpp 2017-05-08 03:04:26 +0000
211	+++ tests/unit-tests/compositor/test_temporary_buffers.cpp 2017-05-25 05:52:50 +0000
212	@@ -45,7 +45,6 @@
213	MOCK_METHOD1(compositor_release, void(std::shared_ptr<mg::Buffer> const&));
214	MOCK_METHOD0(snapshot_acquire, std::shared_ptr<mg::Buffer>());
215	MOCK_METHOD1(snapshot_release, void(std::shared_ptr<mg::Buffer> const&));
216	- MOCK_METHOD1(set_mode, void(mc::MultiMonitorMode));
217	};
218
219	class TemporaryBuffersTest : public ::testing::Test