1
=== modified file 'src/server/compositor/multi_threaded_compositor.cpp'
2
--- src/server/compositor/multi_threaded_compositor.cpp	2015-09-16 13:24:54 +0000
3
+++ src/server/compositor/multi_threaded_compositor.cpp	2015-09-22 14:53:46 +0000
4
@@ -82,15 +82,15 @@
5
82
82
6
83
        mir::set_thread_name("Mir/Comp");
83
        mir::set_thread_name("Mir/Comp");
7
84
84
8
85
        auto const comp_id = this;
9
86
        std::vector<std::tuple<mg::DisplayBuffer*, std::unique_ptr<mc::DisplayBufferCompositor>>> compositors;
85
        std::vector<std::tuple<mg::DisplayBuffer*, std::unique_ptr<mc::DisplayBufferCompositor>>> compositors;
10
87
        group.for_each_display_buffer(
86
        group.for_each_display_buffer(
12
88
        [this, &compositors, &comp_id](mg::DisplayBuffer& buffer)
87
        [this, &compositors](mg::DisplayBuffer& buffer)
13
89
        {
88
        {
14
90
            compositors.emplace_back(
89
            compositors.emplace_back(
15
91
                std::make_tuple(&buffer, compositor_factory->create_compositor_for(buffer)));
90
                std::make_tuple(&buffer, compositor_factory->create_compositor_for(buffer)));
16
92
91
18
93
            const auto& r = buffer.view_area();
92
            auto const& r = buffer.view_area();
19
93
            auto const comp_id = std::get<1>(compositors.back()).get();
20
94
            report->added_display(r.size.width.as_int(), r.size.height.as_int(),
94
            report->added_display(r.size.width.as_int(), r.size.height.as_int(),
21
95
                                  r.top_left.x.as_int(), r.top_left.y.as_int(),
95
                                  r.top_left.x.as_int(), r.top_left.y.as_int(),
22
96
                                  CompositorReport::SubCompositorId{comp_id});
96
                                  CompositorReport::SubCompositorId{comp_id});
23
@@ -103,8 +103,15 @@
24
103
                { display_listener->remove_display(buffer.view_area()); });});
103
                { display_listener->remove_display(buffer.view_area()); });});
25
104
104
26
105
        auto compositor_registration = mir::raii::paired_calls(
105
        auto compositor_registration = mir::raii::paired_calls(
29
106
            [this,&comp_id]{scene->register_compositor(comp_id);},
106
            [this,&compositors]
30
107
            [this,&comp_id]{scene->unregister_compositor(comp_id);});
107
            {
31
108
                for (auto& compositor : compositors)
32
109
                    scene->register_compositor(std::get<1>(compositor).get());
33
110
            },
34
111
            [this,&compositors]{
35
112
                for (auto& compositor : compositors)
36
113
                    scene->unregister_compositor(std::get<1>(compositor).get());
37
114
            });
38
108
115
39
109
        started.set_value();
116
        started.set_value();
40
110
117
41
@@ -130,9 +137,11 @@
42
130
                frames_scheduled--;
137
                frames_scheduled--;
43
131
                lock.unlock();
138
                lock.unlock();
44
132
139
48
133
                for (auto& compositor : compositors)
140
                for (auto& tuple : compositors)
49
134
                    std::get<1>(compositor)->composite(scene->scene_elements_for(comp_id));
141
                {
50
135
142
                    auto& compositor = std::get<1>(tuple);
51
143
                    compositor->composite(scene->scene_elements_for(compositor.get()));
52
144
                }
53
136
                group.post();
145
                group.post();
54
137
146
55
138
                /*
147
                /*
56
@@ -154,7 +163,15 @@
57
154
                 * important to re-count number of frames pending, separately
163
                 * important to re-count number of frames pending, separately
58
155
                 * to the initial scene_elements_for()...
164
                 * to the initial scene_elements_for()...
59
156
                 */
165
                 */
61
157
                int pending = scene->frames_pending(comp_id);
166
                int pending = 0;
62
167
                for (auto& compositor : compositors)
63
168
                {
64
169
                    auto const comp_id = std::get<1>(compositor).get();
65
170
                    int pend = scene->frames_pending(comp_id);
66
171
                    if (pend > pending)
67
172
                        pending = pend;
68
173
                }
69
174
70
158
                if (pending > frames_scheduled)
175
                if (pending > frames_scheduled)
71
159
                    frames_scheduled = pending;
176
                    frames_scheduled = pending;
72
160
            }
177
            }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-09-22
Kevin DuBois (community)			Approve on 2015-09-22
Alan Griffiths		2015-09-21	Approve on 2015-09-22
Review via email: mp+271844@code.launchpad.net
1	=== modified file 'src/server/compositor/multi_threaded_compositor.cpp'
2	--- src/server/compositor/multi_threaded_compositor.cpp 2015-09-16 13:24:54 +0000
3	+++ src/server/compositor/multi_threaded_compositor.cpp 2015-09-22 14:53:46 +0000
4	@@ -82,15 +82,15 @@
5	82		82
6	83	mir::set_thread_name("Mir/Comp");	83	mir::set_thread_name("Mir/Comp");
7	84		84
8	85	auto const comp_id = this;
9	86	std::vector<std::tuple<mg::DisplayBuffer*, std::unique_ptr<mc::DisplayBufferCompositor>>> compositors;	85	std::vector<std::tuple<mg::DisplayBuffer*, std::unique_ptr<mc::DisplayBufferCompositor>>> compositors;
10	87	group.for_each_display_buffer(	86	group.for_each_display_buffer(
12	88	[this, &compositors, &comp_id](mg::DisplayBuffer& buffer)	87	[this, &compositors](mg::DisplayBuffer& buffer)
13	89	{	88	{
14	90	compositors.emplace_back(	89	compositors.emplace_back(
15	91	std::make_tuple(&buffer, compositor_factory->create_compositor_for(buffer)));	90	std::make_tuple(&buffer, compositor_factory->create_compositor_for(buffer)));
16	92		91
18	93	const auto& r = buffer.view_area();	92	auto const& r = buffer.view_area();
19			93	auto const comp_id = std::get<1>(compositors.back()).get();
20	94	report->added_display(r.size.width.as_int(), r.size.height.as_int(),	94	report->added_display(r.size.width.as_int(), r.size.height.as_int(),
21	95	r.top_left.x.as_int(), r.top_left.y.as_int(),	95	r.top_left.x.as_int(), r.top_left.y.as_int(),
22	96	CompositorReport::SubCompositorId{comp_id});	96	CompositorReport::SubCompositorId{comp_id});
23	@@ -103,8 +103,15 @@
24	103	{ display_listener->remove_display(buffer.view_area()); });});	103	{ display_listener->remove_display(buffer.view_area()); });});
25	104		104
26	105	auto compositor_registration = mir::raii::paired_calls(	105	auto compositor_registration = mir::raii::paired_calls(
29	106	[this,&comp_id]{scene->register_compositor(comp_id);},	106	[this,&compositors]
30	107	[this,&comp_id]{scene->unregister_compositor(comp_id);});	107	{
31			108	for (auto& compositor : compositors)
32			109	scene->register_compositor(std::get<1>(compositor).get());
33			110	},
34			111	[this,&compositors]{
35			112	for (auto& compositor : compositors)
36			113	scene->unregister_compositor(std::get<1>(compositor).get());
37			114	});
38	108		115
39	109	started.set_value();	116	started.set_value();
40	110		117
41	@@ -130,9 +137,11 @@
42	130	frames_scheduled--;	137	frames_scheduled--;
43	131	lock.unlock();	138	lock.unlock();
44	132		139
48	133	for (auto& compositor : compositors)	140	for (auto& tuple : compositors)
49	134	std::get<1>(compositor)->composite(scene->scene_elements_for(comp_id));	141	{
50	135		142	auto& compositor = std::get<1>(tuple);
51			143	compositor->composite(scene->scene_elements_for(compositor.get()));
52			144	}
53	136	group.post();	145	group.post();
54	137		146
55	138	/*	147	/*
56	@@ -154,7 +163,15 @@
57	154	* important to re-count number of frames pending, separately	163	* important to re-count number of frames pending, separately
58	155	* to the initial scene_elements_for()...	164	* to the initial scene_elements_for()...
59	156	*/	165	*/
61	157	int pending = scene->frames_pending(comp_id);	166	int pending = 0;
62			167	for (auto& compositor : compositors)
63			168	{
64			169	auto const comp_id = std::get<1>(compositor).get();
65			170	int pend = scene->frames_pending(comp_id);
66			171	if (pend > pending)
67			172	pending = pend;
68			173	}
69			174
70	158	if (pending > frames_scheduled)	175	if (pending > frames_scheduled)
71	159	frames_scheduled = pending;	176	frames_scheduled = pending;
72	160	}	177	}