1
=== modified file 'src/server/compositor/multi_threaded_compositor.cpp'
2
--- src/server/compositor/multi_threaded_compositor.cpp	2017-01-20 12:32:45 +0000
3
+++ src/server/compositor/multi_threaded_compositor.cpp	2017-03-09 09:52:49 +0000
4
@@ -32,6 +32,7 @@
5
32
#include "mir/unwind_helpers.h"
32
#include "mir/unwind_helpers.h"
6
33
#include "mir/thread_name.h"
33
#include "mir/thread_name.h"
7
34
34
8
35
#include <shared_mutex>
9
35
#include <thread>
36
#include <thread>
10
36
#include <chrono>
37
#include <chrono>
11
37
#include <condition_variable>
38
#include <condition_variable>
12
@@ -48,6 +49,8 @@
13
48
namespace compositor
49
namespace compositor
14
49
{
50
{
15
50
51
16
52
extern std::shared_timed_mutex gpu_load_balance;
17
53
18
51
class CompositingFunctor
54
class CompositingFunctor
19
52
{
55
{
20
53
public:
56
public:
21
@@ -113,6 +116,7 @@
22
113
        try
116
        try
23
114
        {
117
        {
24
115
            std::unique_lock<std::mutex> lock{run_mutex};
118
            std::unique_lock<std::mutex> lock{run_mutex};
25
119
            std::shared_lock<std::shared_timed_mutex> throttle(gpu_load_balance);
26
116
            while (running)
120
            while (running)
27
117
            {
121
            {
28
118
                /* Wait until compositing has been scheduled or we are stopped */
122
                /* Wait until compositing has been scheduled or we are stopped */
29
@@ -140,6 +144,11 @@
30
140
                        auto& compositor = std::get<1>(tuple);
144
                        auto& compositor = std::get<1>(tuple);
31
141
                        compositor->composite(scene->scene_elements_for(compositor.get()));
145
                        compositor->composite(scene->scene_elements_for(compositor.get()));
32
142
                    }
146
                    }
33
147
34
148
                    // Only allow unthrottled clients to saturate the GPU during
35
149
                    // page flipping where we're basically idle waiting for
36
150
                    // vblank...
37
151
                    throttle.unlock();
38
143
                    group.post();
152
                    group.post();
39
144
153
40
145
                    /*
154
                    /*
41
@@ -153,6 +162,7 @@
42
153
                                 force_sleep : group.recommended_sleep();
162
                                 force_sleep : group.recommended_sleep();
43
154
                    std::this_thread::sleep_for(delay);
163
                    std::this_thread::sleep_for(delay);
44
155
164
45
165
                    throttle.lock();
46
156
                    lock.lock();
166
                    lock.lock();
47
157
167
48
158
                    /*
168
                    /*
49
159
169
50
=== modified file 'src/server/compositor/stream.cpp'
51
--- src/server/compositor/stream.cpp	2017-03-08 19:29:37 +0000
52
+++ src/server/compositor/stream.cpp	2017-03-09 09:52:49 +0000
53
@@ -26,6 +26,7 @@
54
26
#include "mir/compositor/frame_dropping_policy_factory.h"
26
#include "mir/compositor/frame_dropping_policy_factory.h"
55
27
#include "mir/compositor/frame_dropping_policy.h"
27
#include "mir/compositor/frame_dropping_policy.h"
56
28
#include <boost/throw_exception.hpp>
28
#include <boost/throw_exception.hpp>
57
29
#include <shared_mutex>
58
29
30
59
30
namespace mc = mir::compositor;
31
namespace mc = mir::compositor;
60
31
namespace geom = mir::geometry;
32
namespace geom = mir::geometry;
61
@@ -33,6 +34,10 @@
62
33
namespace ms = mir::scene;
34
namespace ms = mir::scene;
63
34
namespace geom = mir::geometry;
35
namespace geom = mir::geometry;
64
35
36
65
37
namespace mir { namespace compositor {
66
38
    std::shared_timed_mutex gpu_load_balance;
67
39
} } // namespace mir::compositor
68
40
69
36
enum class mc::Stream::ScheduleMode {
41
enum class mc::Stream::ScheduleMode {
70
37
    Queueing,
42
    Queueing,
71
38
    Dropping
43
    Dropping
72
@@ -109,7 +114,9 @@
73
109
    // IO. Holding it locked blocks the compositor thread(s) from rendering.
114
    // IO. Holding it locked blocks the compositor thread(s) from rendering.
74
110
    if (deferred_io.valid())
115
    if (deferred_io.valid())
75
111
    {
116
    {
77
112
        // TODO: Throttling of GPU hogs goes here (LP: #1211700, LP: #1665802)
117
        // Throttle GPU hogs such that they can only saturate the GPU while
78
118
        // no compositors are needing it (LP: #1211700, LP: #1665802)
79
119
        { std::unique_lock<std::shared_timed_mutex> lock(gpu_load_balance); }
80
113
        deferred_io.wait();
120
        deferred_io.wait();
81
114
    }
121
    }
82
115
}
122
}
Reviewer	Review Type	Status
Mir CI Bot	continuous-integration	Needs Fixing on 2017-03-09
Daniel van Vugt		Disapprove on 2017-03-09
Review via email: mp+319410@code.launchpad.net