1
=== modified file 'src/include/platform/mir/graphics/display_report.h'
2
--- src/include/platform/mir/graphics/display_report.h	2015-01-21 07:34:50 +0000
3
+++ src/include/platform/mir/graphics/display_report.h	2015-03-04 14:36:55 +0000
4
@@ -35,6 +35,8 @@
5
35
    virtual void report_successful_egl_buffer_swap_on_construction() = 0;
35
    virtual void report_successful_egl_buffer_swap_on_construction() = 0;
6
36
    virtual void report_successful_display_construction() = 0;
36
    virtual void report_successful_display_construction() = 0;
7
37
    virtual void report_egl_configuration(EGLDisplay disp, EGLConfig cfg) = 0;
37
    virtual void report_egl_configuration(EGLDisplay disp, EGLConfig cfg) = 0;
8
38
    virtual void report_vsync(unsigned int display_id) = 0;
9
39
10
38
    /* gbm specific */
40
    /* gbm specific */
11
39
    virtual void report_successful_drm_mode_set_crtc_on_construction() = 0;
41
    virtual void report_successful_drm_mode_set_crtc_on_construction() = 0;
12
40
    virtual void report_drm_master_failure(int error) = 0;
42
    virtual void report_drm_master_failure(int error) = 0;
13
41
43
14
=== modified file 'src/platforms/android/server/display.cpp'
15
--- src/platforms/android/server/display.cpp	2015-03-03 06:56:37 +0000
16
+++ src/platforms/android/server/display.cpp	2015-03-04 14:36:55 +0000
17
@@ -135,9 +135,12 @@
18
135
    std::shared_ptr<GLConfig> const& gl_config,
135
    std::shared_ptr<GLConfig> const& gl_config,
19
136
    std::shared_ptr<DisplayReport> const& display_report,
136
    std::shared_ptr<DisplayReport> const& display_report,
20
137
    mga::OverlayOptimization overlay_option) :
137
    mga::OverlayOptimization overlay_option) :
21
138
    display_report{display_report},
22
138
    display_buffer_builder{display_buffer_builder},
139
    display_buffer_builder{display_buffer_builder},
23
139
    hwc_config{display_buffer_builder->create_hwc_configuration()},
140
    hwc_config{display_buffer_builder->create_hwc_configuration()},
25
140
    hotplug_subscription{hwc_config->subscribe_to_config_changes(std::bind(&mga::Display::on_hotplug, this))},
141
    hotplug_subscription{hwc_config->subscribe_to_config_changes(
26
142
        std::bind(&mga::Display::on_hotplug, this),
27
143
        std::bind(&mga::Display::on_vsync, this, std::placeholders::_1))},
28
141
    primary_attribs(hwc_config->active_attribs_for(mga::DisplayName::primary)),
144
    primary_attribs(hwc_config->active_attribs_for(mga::DisplayName::primary)),
29
142
    external_attribs(hwc_config->active_attribs_for(mga::DisplayName::external)),
145
    external_attribs(hwc_config->active_attribs_for(mga::DisplayName::external)),
30
143
    config(
146
    config(
31
@@ -269,6 +272,11 @@
32
269
    display_change_pipe->notify_change();
272
    display_change_pipe->notify_change();
33
270
}
273
}
34
271
274
35
275
void mga::Display::on_vsync(DisplayName name) const
36
276
{
37
277
    display_report->report_vsync(name);
38
278
}
39
279
40
272
void mga::Display::register_configuration_change_handler(
280
void mga::Display::register_configuration_change_handler(
41
273
    EventHandlerRegister& event_handler,
281
    EventHandlerRegister& event_handler,
42
274
    DisplayConfigurationChangeHandler const& change_handler)
282
    DisplayConfigurationChangeHandler const& change_handler)
43
275
283
44
=== modified file 'src/platforms/android/server/display.h'
45
--- src/platforms/android/server/display.h	2015-03-03 06:56:37 +0000
46
+++ src/platforms/android/server/display.h	2015-03-04 14:36:55 +0000
47
@@ -80,7 +80,9 @@
48
80
80
49
81
private:
81
private:
50
82
    void on_hotplug();
82
    void on_hotplug();
51
83
    void on_vsync(DisplayName) const;
52
83
84
53
85
    std::shared_ptr<DisplayReport> const display_report;
54
84
    std::shared_ptr<DisplayComponentFactory> const display_buffer_builder;
86
    std::shared_ptr<DisplayComponentFactory> const display_buffer_builder;
55
85
    std::mutex mutable configuration_mutex;
87
    std::mutex mutable configuration_mutex;
56
86
    bool mutable configuration_dirty{false};
88
    bool mutable configuration_dirty{false};
57
87
89
58
=== modified file 'src/platforms/android/server/fb_device.cpp'
59
--- src/platforms/android/server/fb_device.cpp	2015-03-03 06:56:37 +0000
60
+++ src/platforms/android/server/fb_device.cpp	2015-03-04 14:36:55 +0000
61
@@ -68,7 +68,9 @@
62
68
      fb_num};
68
      fb_num};
63
69
}
69
}
64
70
70
66
71
mga::ConfigChangeSubscription mga::FbControl::subscribe_to_config_changes(std::function<void()> const&)
71
mga::ConfigChangeSubscription mga::FbControl::subscribe_to_config_changes(
67
72
        std::function<void()> const&,
68
73
        std::function<void(DisplayName)> const&)
69
72
{
74
{
70
73
    return nullptr;
75
    return nullptr;
71
74
}
76
}
72
75
77
73
=== modified file 'src/platforms/android/server/fb_device.h'
74
--- src/platforms/android/server/fb_device.h	2015-03-03 06:56:37 +0000
75
+++ src/platforms/android/server/fb_device.h	2015-03-04 14:36:55 +0000
76
@@ -37,7 +37,9 @@
77
37
    FbControl(std::shared_ptr<framebuffer_device_t> const& fbdev);
37
    FbControl(std::shared_ptr<framebuffer_device_t> const& fbdev);
78
38
    void power_mode(DisplayName, MirPowerMode) override;
38
    void power_mode(DisplayName, MirPowerMode) override;
79
39
    DisplayAttribs active_attribs_for(DisplayName) override;
39
    DisplayAttribs active_attribs_for(DisplayName) override;
81
40
    ConfigChangeSubscription subscribe_to_config_changes(std::function<void()> const& cb) override;
40
    ConfigChangeSubscription subscribe_to_config_changes(
82
41
        std::function<void()> const& hotplug_cb,
83
42
        std::function<void(DisplayName)> const& vsync_cb) override;
84
41
private:
43
private:
85
42
    std::shared_ptr<framebuffer_device_t> const fb_device;
44
    std::shared_ptr<framebuffer_device_t> const fb_device;
86
43
};
45
};
87
44
46
88
=== modified file 'src/platforms/android/server/hwc_blanking_control.cpp'
89
--- src/platforms/android/server/hwc_blanking_control.cpp	2015-03-03 06:56:37 +0000
90
+++ src/platforms/android/server/hwc_blanking_control.cpp	2015-03-04 14:36:55 +0000
91
@@ -146,13 +146,14 @@
92
146
}
146
}
93
147
147
94
148
mga::ConfigChangeSubscription mga::HwcBlankingControl::subscribe_to_config_changes(
148
mga::ConfigChangeSubscription mga::HwcBlankingControl::subscribe_to_config_changes(
96
149
    std::function<void()> const& hotplug)
149
    std::function<void()> const& hotplug,
97
150
    std::function<void(DisplayName)> const& vsync)
98
150
{
151
{
99
151
    return std::make_shared<
152
    return std::make_shared<
100
152
        mir::raii::PairedCalls<std::function<void()>, std::function<void()>>>(
153
        mir::raii::PairedCalls<std::function<void()>, std::function<void()>>>(
102
153
        [hotplug, this]{
154
        [hotplug, vsync, this]{
103
154
            hwc_device->subscribe_to_events(this,
155
            hwc_device->subscribe_to_events(this,
105
155
                [](DisplayName, std::chrono::nanoseconds){},
156
                [vsync](DisplayName name, std::chrono::nanoseconds){ vsync(name); },
106
156
                [hotplug](DisplayName, bool){ hotplug(); },
157
                [hotplug](DisplayName, bool){ hotplug(); },
107
157
                []{});
158
                []{});
108
158
        },
159
        },
109
159
160
110
=== modified file 'src/platforms/android/server/hwc_configuration.h'
111
--- src/platforms/android/server/hwc_configuration.h	2015-02-13 06:12:34 +0000
112
+++ src/platforms/android/server/hwc_configuration.h	2015-03-04 14:36:55 +0000
113
@@ -50,7 +50,9 @@
114
50
    virtual ~HwcConfiguration() = default;
50
    virtual ~HwcConfiguration() = default;
115
51
    virtual void power_mode(DisplayName, MirPowerMode) = 0;
51
    virtual void power_mode(DisplayName, MirPowerMode) = 0;
116
52
    virtual DisplayAttribs active_attribs_for(DisplayName) = 0; 
52
    virtual DisplayAttribs active_attribs_for(DisplayName) = 0; 
118
53
    virtual ConfigChangeSubscription subscribe_to_config_changes(std::function<void()> const& cb) = 0;
53
    virtual ConfigChangeSubscription subscribe_to_config_changes(
119
54
        std::function<void()> const& hotplug_cb,
120
55
        std::function<void(DisplayName)> const& vsync_cb) = 0;
121
54
56
122
55
protected:
57
protected:
123
56
    HwcConfiguration() = default;
58
    HwcConfiguration() = default;
124
@@ -65,7 +67,9 @@
125
65
    HwcBlankingControl(std::shared_ptr<HwcWrapper> const&);
67
    HwcBlankingControl(std::shared_ptr<HwcWrapper> const&);
126
66
    void power_mode(DisplayName, MirPowerMode) override;
68
    void power_mode(DisplayName, MirPowerMode) override;
127
67
    DisplayAttribs active_attribs_for(DisplayName) override;
69
    DisplayAttribs active_attribs_for(DisplayName) override;
129
68
    ConfigChangeSubscription subscribe_to_config_changes(std::function<void()> const& cb) override;
70
    ConfigChangeSubscription subscribe_to_config_changes(
130
71
        std::function<void()> const& hotplug_cb,
131
72
        std::function<void(DisplayName)> const& vsync_cb) override;
132
69
73
133
70
private:
74
private:
134
71
    DeviceQuirks quirks{PropertiesOps{}};
75
    DeviceQuirks quirks{PropertiesOps{}};
135
72
76
136
=== modified file 'src/platforms/mesa/server/display.cpp'
137
--- src/platforms/mesa/server/display.cpp	2015-02-26 03:20:09 +0000
138
+++ src/platforms/mesa/server/display.cpp	2015-03-04 14:36:55 +0000
139
@@ -88,7 +88,7 @@
140
88
      monitor(mir::udev::Context()),
88
      monitor(mir::udev::Context()),
141
89
      shared_egl{*gl_config},
89
      shared_egl{*gl_config},
142
90
      output_container{platform->drm->fd,
90
      output_container{platform->drm->fd,
144
91
                       std::make_shared<KMSPageFlipper>(platform->drm->fd)},
91
                       std::make_shared<KMSPageFlipper>(platform->drm->fd, listener)},
145
92
      current_display_configuration{platform->drm->fd},
92
      current_display_configuration{platform->drm->fd},
146
93
      gl_config{gl_config}
93
      gl_config{gl_config}
147
94
{
94
{
148
95
95
149
=== modified file 'src/platforms/mesa/server/kms_page_flipper.cpp'
150
--- src/platforms/mesa/server/kms_page_flipper.cpp	2015-01-22 09:00:14 +0000
151
+++ src/platforms/mesa/server/kms_page_flipper.cpp	2015-03-04 14:36:55 +0000
152
@@ -37,15 +37,18 @@
153
37
                       void* data)
37
                       void* data)
154
38
{
38
{
155
39
    auto page_flip_data = static_cast<mgm::PageFlipEventData*>(data);
39
    auto page_flip_data = static_cast<mgm::PageFlipEventData*>(data);
165
40
    page_flip_data->pending->erase(page_flip_data->crtc_id);
40
    page_flip_data->flipper->notify_page_flip(page_flip_data->crtc_id);
166
41
}
41
}
167
42
42
168
43
}
43
}
169
44
44
170
45
mgm::KMSPageFlipper::KMSPageFlipper(int drm_fd)
45
mgm::KMSPageFlipper::KMSPageFlipper(
171
46
    : drm_fd{drm_fd},
46
    int drm_fd,
172
47
      pending_page_flips(),
47
    std::shared_ptr<DisplayReport> const& report) :
173
48
      worker_tid()
48
    drm_fd{drm_fd},
174
49
    report{report},
175
50
    pending_page_flips(),
176
51
    worker_tid()
177
49
{
52
{
178
50
}
53
}
179
51
54
180
@@ -56,7 +59,7 @@
181
56
    if (pending_page_flips.find(crtc_id) != pending_page_flips.end())
59
    if (pending_page_flips.find(crtc_id) != pending_page_flips.end())
182
57
        BOOST_THROW_EXCEPTION(std::logic_error("Page flip for crtc_id is already scheduled"));
60
        BOOST_THROW_EXCEPTION(std::logic_error("Page flip for crtc_id is already scheduled"));
183
58
61
185
59
    pending_page_flips[crtc_id] = PageFlipEventData{&pending_page_flips, crtc_id};
62
    pending_page_flips[crtc_id] = PageFlipEventData{crtc_id, this};
186
60
63
187
61
    auto ret = drmModePageFlip(drm_fd, crtc_id, fb_id,
64
    auto ret = drmModePageFlip(drm_fd, crtc_id, fb_id,
188
62
                               DRM_MODE_PAGE_FLIP_EVENT,
65
                               DRM_MODE_PAGE_FLIP_EVENT,
189
@@ -154,3 +157,9 @@
190
154
{
157
{
191
155
    return pending_page_flips.find(crtc_id) == pending_page_flips.end();
158
    return pending_page_flips.find(crtc_id) == pending_page_flips.end();
192
156
}
159
}
193
160
194
161
void mgm::KMSPageFlipper::notify_page_flip(uint32_t crtc_id)
195
162
{
196
163
    report->report_vsync(crtc_id);
197
164
    pending_page_flips.erase(crtc_id);
198
165
}
199
157
166
200
=== modified file 'src/platforms/mesa/server/kms_page_flipper.h'
201
--- src/platforms/mesa/server/kms_page_flipper.h	2015-01-22 09:00:14 +0000
202
+++ src/platforms/mesa/server/kms_page_flipper.h	2015-03-04 14:36:55 +0000
203
@@ -39,26 +39,29 @@
204
39
namespace mesa
39
namespace mesa
205
40
{
40
{
206
41
41
207
42
class KMSPageFlipper;
208
42
struct PageFlipEventData
43
struct PageFlipEventData
209
43
{
44
{
210
44
    std::unordered_map<uint32_t,PageFlipEventData>* pending;
211
45
    uint32_t crtc_id;
45
    uint32_t crtc_id;
212
46
    KMSPageFlipper* flipper;
213
46
};
47
};
214
47
48
215
48
class KMSPageFlipper : public PageFlipper
49
class KMSPageFlipper : public PageFlipper
216
49
{
50
{
217
50
public:
51
public:
219
51
    KMSPageFlipper(int drm_fd);
52
    KMSPageFlipper(int drm_fd, std::shared_ptr<DisplayReport> const& report);
220
52
53
221
53
    bool schedule_flip(uint32_t crtc_id, uint32_t fb_id);
54
    bool schedule_flip(uint32_t crtc_id, uint32_t fb_id);
222
54
    void wait_for_flip(uint32_t crtc_id);
55
    void wait_for_flip(uint32_t crtc_id);
223
55
56
224
56
    std::thread::id debug_get_worker_tid();
57
    std::thread::id debug_get_worker_tid();
225
57
58
226
59
    void notify_page_flip(uint32_t crtc_id); 
227
58
private:
60
private:
228
59
    bool page_flip_is_done(uint32_t crtc_id);
61
    bool page_flip_is_done(uint32_t crtc_id);
229
60
62
230
61
    int const drm_fd;
63
    int const drm_fd;
231
64
    std::shared_ptr<DisplayReport> const report;
232
62
    std::unordered_map<uint32_t,PageFlipEventData> pending_page_flips;
65
    std::unordered_map<uint32_t,PageFlipEventData> pending_page_flips;
233
63
    std::mutex pf_mutex;
66
    std::mutex pf_mutex;
234
64
    std::condition_variable pf_cv;
67
    std::condition_variable pf_cv;
235
65
68
236
=== modified file 'src/server/report/logging/display_report.cpp'
237
--- src/server/report/logging/display_report.cpp	2015-01-21 07:34:50 +0000
238
+++ src/server/report/logging/display_report.cpp	2015-03-04 14:36:55 +0000
239
@@ -25,7 +25,12 @@
240
25
namespace ml=mir::logging;
25
namespace ml=mir::logging;
241
26
namespace mrl=mir::report::logging;
26
namespace mrl=mir::report::logging;
242
27
27
244
28
mrl::DisplayReport::DisplayReport(const std::shared_ptr<ml::Logger>& logger) : logger(logger)
28
mrl::DisplayReport::DisplayReport(
245
29
    std::shared_ptr<ml::Logger> const& logger,
246
30
    std::shared_ptr<time::Clock> const& clock) :
247
31
    logger(logger),
248
32
    clock(clock),
249
33
    last_report(clock->now())
250
29
{
34
{
251
30
}
35
}
252
31
36
253
@@ -141,3 +146,23 @@
254
141
            "    [" + i.name + "] : " + std::to_string(value), component());
146
            "    [" + i.name + "] : " + std::to_string(value), component());
255
142
    }
147
    }
256
143
}
148
}
257
149
258
150
void mrl::DisplayReport::report_vsync(unsigned int display_id)
259
151
{
260
152
    using namespace std::chrono;
261
153
    seconds const static report_interval{1};
262
154
    std::unique_lock<decltype(vsync_event_mutex)> lk(vsync_event_mutex);
263
155
    auto now = clock->now();
264
156
    event_map[display_id]++;
265
157
    if (now > last_report + report_interval)
266
158
    {
267
159
        for(auto const& event : event_map)
268
160
            logger->log(ml::Severity::informational,
269
161
                std::to_string(event.second) + " vsync events on [" +
270
162
                std::to_string(event.first) + "] over " +
271
163
                std::to_string(duration_cast<milliseconds>(now - last_report).count()) + "ms",
272
164
                component());
273
165
        event_map.clear();
274
166
        last_report = now;
275
167
    }
276
168
}
277
144
169
278
=== modified file 'src/server/report/logging/display_report.h'
279
--- src/server/report/logging/display_report.h	2015-01-21 07:34:50 +0000
280
+++ src/server/report/logging/display_report.h	2015-03-04 14:36:55 +0000
281
@@ -21,8 +21,11 @@
282
21
#define MIR_REPORT_LOGGING_DISPLAY_REPORTER_H_
21
#define MIR_REPORT_LOGGING_DISPLAY_REPORTER_H_
283
22
22
284
23
#include "mir/graphics/display_report.h"
23
#include "mir/graphics/display_report.h"
285
24
#include "mir/time/clock.h"
286
24
25
287
26
#include <unordered_map>
288
25
#include <memory>
27
#include <memory>
289
28
#include <mutex>
290
26
29
291
27
namespace mir
30
namespace mir
292
28
{
31
{
293
@@ -41,25 +44,33 @@
294
41
44
295
42
    static const char* component();
45
    static const char* component();
296
43
46
298
44
    DisplayReport(const std::shared_ptr<mir::logging::Logger>& logger);
47
    DisplayReport(
299
48
        std::shared_ptr<mir::logging::Logger> const& logger,
300
49
        std::shared_ptr<time::Clock> const& clock);
301
50
302
45
    virtual ~DisplayReport();
51
    virtual ~DisplayReport();
303
46
52
313
47
    virtual void report_successful_setup_of_native_resources();
53
    virtual void report_successful_setup_of_native_resources() override;
314
48
    virtual void report_successful_egl_make_current_on_construction();
54
    virtual void report_successful_egl_make_current_on_construction() override;
315
49
    virtual void report_successful_egl_buffer_swap_on_construction();
55
    virtual void report_successful_egl_buffer_swap_on_construction() override;
316
50
    virtual void report_successful_drm_mode_set_crtc_on_construction();
56
    virtual void report_successful_drm_mode_set_crtc_on_construction() override;
317
51
    virtual void report_successful_display_construction();
57
    virtual void report_successful_display_construction() override;
318
52
    virtual void report_drm_master_failure(int error);
58
    virtual void report_vsync(unsigned int display_id) override;
319
53
    virtual void report_vt_switch_away_failure();
59
    virtual void report_drm_master_failure(int error) override;
320
54
    virtual void report_vt_switch_back_failure();
60
    virtual void report_vt_switch_away_failure() override;
321
55
    virtual void report_egl_configuration(EGLDisplay disp, EGLConfig cfg);
61
    virtual void report_vt_switch_back_failure() override;
322
62
    virtual void report_egl_configuration(EGLDisplay disp, EGLConfig cfg) override;
323
56
63
324
57
  protected:
64
  protected:
327
58
    DisplayReport(const DisplayReport&) = delete;
65
    DisplayReport(DisplayReport const&) = delete;
328
59
    DisplayReport& operator=(const DisplayReport&) = delete;
66
    DisplayReport& operator=(DisplayReport const&) = delete;
329
60
67
330
61
  private:
68
  private:
332
62
    std::shared_ptr<mir::logging::Logger> logger;
69
    std::shared_ptr<mir::logging::Logger> const logger;
333
70
    std::shared_ptr<time::Clock> const clock;
334
71
    std::mutex vsync_event_mutex;
335
72
    mir::time::Timestamp last_report;
336
73
    std::unordered_map<unsigned int, unsigned int> event_map;
337
63
};
74
};
338
64
}
75
}
339
65
}
76
}
340
66
77
341
=== modified file 'src/server/report/logging/logging_report_factory.cpp'
342
--- src/server/report/logging/logging_report_factory.cpp	2015-02-13 06:12:34 +0000
343
+++ src/server/report/logging/logging_report_factory.cpp	2015-03-04 14:36:55 +0000
344
@@ -45,7 +45,7 @@
345
45
45
346
46
std::shared_ptr<mir::graphics::DisplayReport> mr::LoggingReportFactory::create_display_report()
46
std::shared_ptr<mir::graphics::DisplayReport> mr::LoggingReportFactory::create_display_report()
347
47
{
47
{
349
48
    return std::make_shared<logging::DisplayReport>(logger);
48
    return std::make_shared<logging::DisplayReport>(logger, clock);
350
49
}
49
}
351
50
50
352
51
std::shared_ptr<mir::scene::SceneReport> mr::LoggingReportFactory::create_scene_report()
51
std::shared_ptr<mir::scene::SceneReport> mr::LoggingReportFactory::create_scene_report()
353
52
52
354
=== modified file 'src/server/report/lttng/display_report.cpp'
355
--- src/server/report/lttng/display_report.cpp	2014-02-09 16:18:16 +0000
356
+++ src/server/report/lttng/display_report.cpp	2015-03-04 14:36:55 +0000
357
@@ -35,7 +35,6 @@
358
35
DISPLAY_REPORT_TRACE_CALL(report_successful_drm_mode_set_crtc_on_construction)
35
DISPLAY_REPORT_TRACE_CALL(report_successful_drm_mode_set_crtc_on_construction)
359
36
DISPLAY_REPORT_TRACE_CALL(report_vt_switch_away_failure)
36
DISPLAY_REPORT_TRACE_CALL(report_vt_switch_away_failure)
360
37
DISPLAY_REPORT_TRACE_CALL(report_vt_switch_back_failure)
37
DISPLAY_REPORT_TRACE_CALL(report_vt_switch_back_failure)
361
38
DISPLAY_REPORT_TRACE_CALL(report_gpu_composition_in_use)
362
39
38
363
40
#undef DISPLAY_REPORT_TRACE_CALL
39
#undef DISPLAY_REPORT_TRACE_CALL
364
41
40
365
@@ -43,15 +42,12 @@
366
43
{
42
{
367
44
}
43
}
368
45
44
369
46
370
47
void mir::report::lttng::DisplayReport::report_drm_master_failure(int error)
45
void mir::report::lttng::DisplayReport::report_drm_master_failure(int error)
371
48
{
46
{
372
49
    mir_tracepoint(mir_server_display, report_drm_master_failure, strerror(error));
47
    mir_tracepoint(mir_server_display, report_drm_master_failure, strerror(error));
373
50
}
48
}
374
51
49
377
52
50
void mir::report::lttng::DisplayReport::report_vsync(unsigned int display_id)
376
53
void mir::report::lttng::DisplayReport::report_hwc_composition_in_use(int major, int minor)
378
54
{
51
{
380
55
    mir_tracepoint(mir_server_display, report_hwc_composition_in_use, major, minor);
52
    mir_tracepoint(mir_server_display, report_vsync, display_id);
381
56
}
53
}
382
57
383
58
54
384
=== modified file 'src/server/report/lttng/display_report.h'
385
--- src/server/report/lttng/display_report.h	2014-02-17 22:35:23 +0000
386
+++ src/server/report/lttng/display_report.h	2015-03-04 14:36:55 +0000
387
@@ -36,17 +36,16 @@
388
36
    DisplayReport() = default;
36
    DisplayReport() = default;
389
37
    virtual ~DisplayReport() noexcept(true) = default;
37
    virtual ~DisplayReport() noexcept(true) = default;
390
38
38
402
39
    virtual void report_successful_setup_of_native_resources();
39
    virtual void report_successful_setup_of_native_resources() override;
403
40
    virtual void report_successful_egl_make_current_on_construction();
40
    virtual void report_successful_egl_make_current_on_construction() override;
404
41
    virtual void report_successful_egl_buffer_swap_on_construction();
41
    virtual void report_successful_egl_buffer_swap_on_construction() override;
405
42
    virtual void report_successful_display_construction();
42
    virtual void report_successful_display_construction() override;
406
43
    virtual void report_egl_configuration(EGLDisplay disp, EGLConfig cfg);
43
    virtual void report_egl_configuration(EGLDisplay disp, EGLConfig cfg) override;
407
44
    virtual void report_successful_drm_mode_set_crtc_on_construction();
44
    virtual void report_successful_drm_mode_set_crtc_on_construction() override;
408
45
    virtual void report_drm_master_failure(int error);
45
    virtual void report_drm_master_failure(int error) override;
409
46
    virtual void report_vt_switch_away_failure();
46
    virtual void report_vt_switch_away_failure() override;
410
47
    virtual void report_vt_switch_back_failure();
47
    virtual void report_vt_switch_back_failure() override;
411
48
    virtual void report_hwc_composition_in_use(int major, int minor);
48
    virtual void report_vsync(unsigned int display_id) override;
401
49
    virtual void report_gpu_composition_in_use();
412
50
49
413
51
private:
50
private:
414
52
    ServerTracepointProvider tp_provider;
51
    ServerTracepointProvider tp_provider;
415
53
52
416
=== modified file 'src/server/report/lttng/display_report_tp.h'
417
--- src/server/report/lttng/display_report_tp.h	2015-01-21 07:34:50 +0000
418
+++ src/server/report/lttng/display_report_tp.h	2015-03-04 14:36:55 +0000
419
@@ -62,6 +62,15 @@
420
62
    )
62
    )
421
63
)
63
)
422
64
64
423
65
TRACEPOINT_EVENT(
424
66
    mir_server_display,
425
67
    report_vsync,
426
68
    TP_ARGS(int, id),
427
69
    TP_FIELDS(
428
70
        ctf_integer(int, id, id)
429
71
     )
430
72
)
431
73
432
65
#endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
74
#endif /* MIR_LTTNG_DISPLAY_REPORT_TP_H_ */
433
66
75
434
67
#include <lttng/tracepoint-event.h>
76
#include <lttng/tracepoint-event.h>
435
68
77
436
=== modified file 'src/server/report/null/display_report.cpp'
437
--- src/server/report/null/display_report.cpp	2015-01-21 07:34:50 +0000
438
+++ src/server/report/null/display_report.cpp	2015-03-04 14:36:55 +0000
439
@@ -29,3 +29,4 @@
440
29
void mrn::DisplayReport::report_vt_switch_away_failure() {}
29
void mrn::DisplayReport::report_vt_switch_away_failure() {}
441
30
void mrn::DisplayReport::report_vt_switch_back_failure() {}
30
void mrn::DisplayReport::report_vt_switch_back_failure() {}
442
31
void mrn::DisplayReport::report_egl_configuration(EGLDisplay, EGLConfig) {}
31
void mrn::DisplayReport::report_egl_configuration(EGLDisplay, EGLConfig) {}
443
32
void mrn::DisplayReport::report_vsync(unsigned int) {}
444
32
33
445
=== modified file 'src/server/report/null/display_report.h'
446
--- src/server/report/null/display_report.h	2015-01-21 07:34:50 +0000
447
+++ src/server/report/null/display_report.h	2015-03-04 14:36:55 +0000
448
@@ -43,6 +43,7 @@
449
43
    void report_vt_switch_away_failure() override;
43
    void report_vt_switch_away_failure() override;
450
44
    void report_vt_switch_back_failure() override;
44
    void report_vt_switch_back_failure() override;
451
45
    void report_egl_configuration(EGLDisplay disp, EGLConfig cfg) override;
45
    void report_egl_configuration(EGLDisplay disp, EGLConfig cfg) override;
452
46
    void report_vsync(unsigned int display_id) override;
453
46
};
47
};
454
47
}
48
}
455
48
}
49
}
456
49
50
457
=== modified file 'tests/include/mir_test_doubles/mock_display_report.h'
458
--- tests/include/mir_test_doubles/mock_display_report.h	2013-05-10 18:16:51 +0000
459
+++ tests/include/mir_test_doubles/mock_display_report.h	2015-03-04 14:36:55 +0000
460
@@ -41,9 +41,8 @@
461
41
    MOCK_METHOD1(report_drm_master_failure, void(int));
41
    MOCK_METHOD1(report_drm_master_failure, void(int));
462
42
    MOCK_METHOD0(report_vt_switch_away_failure, void());
42
    MOCK_METHOD0(report_vt_switch_away_failure, void());
463
43
    MOCK_METHOD0(report_vt_switch_back_failure, void());
43
    MOCK_METHOD0(report_vt_switch_back_failure, void());
464
44
    MOCK_METHOD2(report_hwc_composition_in_use, void(int,int));
465
45
    MOCK_METHOD0(report_gpu_composition_in_use, void());
466
46
    MOCK_METHOD2(report_egl_configuration, void(EGLDisplay,EGLConfig));
44
    MOCK_METHOD2(report_egl_configuration, void(EGLDisplay,EGLConfig));
467
45
    MOCK_METHOD1(report_vsync, void(unsigned int));
468
47
};
46
};
469
48
47
470
49
}
48
}
471
50
49
472
=== modified file 'tests/include/mir_test_doubles/stub_display_builder.h'
473
--- tests/include/mir_test_doubles/stub_display_builder.h	2015-02-26 03:20:09 +0000
474
+++ tests/include/mir_test_doubles/stub_display_builder.h	2015-03-04 14:36:55 +0000
475
@@ -47,7 +47,7 @@
476
47
    MockHwcConfiguration()
47
    MockHwcConfiguration()
477
48
    {
48
    {
478
49
        using namespace testing;
49
        using namespace testing;
480
50
        ON_CALL(*this, subscribe_to_config_changes(_)).WillByDefault(Return(nullptr));
50
        ON_CALL(*this, subscribe_to_config_changes(_,_)).WillByDefault(Return(nullptr));
481
51
        ON_CALL(*this, active_attribs_for(graphics::android::DisplayName::primary))
51
        ON_CALL(*this, active_attribs_for(graphics::android::DisplayName::primary))
482
52
            .WillByDefault(testing::Return(graphics::android::DisplayAttribs{
52
            .WillByDefault(testing::Return(graphics::android::DisplayAttribs{
483
53
                {0,0},{0,0}, 0.0, true, mir_pixel_format_abgr_8888, 2}));
53
                {0,0},{0,0}, 0.0, true, mir_pixel_format_abgr_8888, 2}));
484
@@ -57,8 +57,9 @@
485
57
    }
57
    }
486
58
    MOCK_METHOD2(power_mode, void(graphics::android::DisplayName, MirPowerMode));
58
    MOCK_METHOD2(power_mode, void(graphics::android::DisplayName, MirPowerMode));
487
59
    MOCK_METHOD1(active_attribs_for, graphics::android::DisplayAttribs(graphics::android::DisplayName));
59
    MOCK_METHOD1(active_attribs_for, graphics::android::DisplayAttribs(graphics::android::DisplayName));
490
60
    MOCK_METHOD1(subscribe_to_config_changes,
60
    MOCK_METHOD2(subscribe_to_config_changes,
491
61
        graphics::android::ConfigChangeSubscription(std::function<void()> const&));
61
        graphics::android::ConfigChangeSubscription(
492
62
            std::function<void()> const&, std::function<void(graphics::android::DisplayName)> const&));
493
62
};
63
};
494
63
64
495
64
struct StubHwcConfiguration : public graphics::android::HwcConfiguration
65
struct StubHwcConfiguration : public graphics::android::HwcConfiguration
496
@@ -77,7 +78,7 @@
497
77
78
498
78
    
79
    
499
79
    graphics::android::ConfigChangeSubscription subscribe_to_config_changes(
80
    graphics::android::ConfigChangeSubscription subscribe_to_config_changes(
501
80
        std::function<void()> const&) override
81
        std::function<void()> const&, std::function<void(graphics::android::DisplayName)> const&) override
502
81
    {
82
    {
503
82
        return nullptr;
83
        return nullptr;
504
83
    }
84
    }
505
84
85
506
=== modified file 'tests/unit-tests/graphics/android/test_display.cpp'
507
--- tests/unit-tests/graphics/android/test_display.cpp	2015-03-03 06:56:37 +0000
508
+++ tests/unit-tests/graphics/android/test_display.cpp	2015-03-04 14:36:55 +0000
509
@@ -554,7 +554,7 @@
510
554
    auto use_count_before = subscription.use_count();
554
    auto use_count_before = subscription.use_count();
511
555
    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
555
    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
512
556
    {
556
    {
514
557
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_))
557
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
515
558
            .WillOnce(Return(subscription));
558
            .WillOnce(Return(subscription));
516
559
    });
559
    });
517
560
    {
560
    {
518
@@ -596,7 +596,7 @@
519
596
596
520
597
    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
597
    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
521
598
    {
598
    {
523
599
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_))
599
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
524
600
            .WillOnce(DoAll(SaveArg<0>(&hotplug_fn), Return(subscription)));
600
            .WillOnce(DoAll(SaveArg<0>(&hotplug_fn), Return(subscription)));
525
601
        EXPECT_CALL(mock_config, active_attribs_for(mga::DisplayName::primary))
601
        EXPECT_CALL(mock_config, active_attribs_for(mga::DisplayName::primary))
526
602
            .Times(2)
602
            .Times(2)
527
@@ -645,7 +645,7 @@
528
645
                return mga::DisplayAttribs{
645
                return mga::DisplayAttribs{
529
646
                    {20,20}, {4,4}, 50.0f, external_connected, mir_pixel_format_abgr_8888, 2};
646
                    {20,20}, {4,4}, 50.0f, external_connected, mir_pixel_format_abgr_8888, 2};
530
647
            }));
647
            }));
532
648
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_))
648
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
533
649
            .WillOnce(DoAll(SaveArg<0>(&hotplug_fn), Return(std::make_shared<char>('2'))));
649
            .WillOnce(DoAll(SaveArg<0>(&hotplug_fn), Return(std::make_shared<char>('2'))));
534
650
    });
650
    });
535
651
651
536
@@ -694,7 +694,7 @@
537
694
    bool external_connected = true;
694
    bool external_connected = true;
538
695
    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
695
    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
539
696
    {
696
    {
541
697
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_))
697
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
542
698
            .WillOnce(DoAll(SaveArg<0>(&hotplug_fn), Return(std::make_shared<char>('2'))));
698
            .WillOnce(DoAll(SaveArg<0>(&hotplug_fn), Return(std::make_shared<char>('2'))));
543
699
        ON_CALL(mock_config, active_attribs_for(mga::DisplayName::primary))
699
        ON_CALL(mock_config, active_attribs_for(mga::DisplayName::primary))
544
700
            .WillByDefault(Return(
700
            .WillByDefault(Return(
545
@@ -779,3 +779,25 @@
546
779
    });
779
    });
547
780
    display.configure(*configuration);
780
    display.configure(*configuration);
548
781
}
781
}
549
782
550
783
TEST_F(Display, reports_vsync)
551
784
{
552
785
    using namespace testing;
553
786
    std::function<void(mga::DisplayName)> vsync_fn = [](mga::DisplayName){};
554
787
    auto report = std::make_shared<NiceMock<mtd::MockDisplayReport>>();
555
788
    EXPECT_CALL(*report, report_vsync(_));
556
789
    stub_db_factory->with_next_config([&](mtd::MockHwcConfiguration& mock_config)
557
790
    {
558
791
        EXPECT_CALL(mock_config, subscribe_to_config_changes(_,_))
559
792
            .WillOnce(DoAll(SaveArg<1>(&vsync_fn), Return(std::make_shared<char>('2'))));
560
793
    });
561
794
562
795
    mga::Display display(
563
796
        stub_db_factory,
564
797
        stub_gl_program_factory,
565
798
        stub_gl_config,
566
799
        report,
567
800
        mga::OverlayOptimization::enabled);
568
801
569
802
    vsync_fn(mga::DisplayName::primary);
570
803
}
571
782
804
572
=== modified file 'tests/unit-tests/graphics/android/test_display_hotplug.cpp'
573
--- tests/unit-tests/graphics/android/test_display_hotplug.cpp	2015-02-13 06:12:34 +0000
574
+++ tests/unit-tests/graphics/android/test_display_hotplug.cpp	2015-03-04 14:36:55 +0000
575
@@ -47,7 +47,7 @@
576
47
            return mga::DisplayAttribs{{0,0}, {0,0}, 0.0, true, mir_pixel_format_abgr_8888, 2};
47
            return mga::DisplayAttribs{{0,0}, {0,0}, 0.0, true, mir_pixel_format_abgr_8888, 2};
577
48
        } 
48
        } 
578
49
        mga::ConfigChangeSubscription subscribe_to_config_changes(
49
        mga::ConfigChangeSubscription subscribe_to_config_changes(
580
50
            std::function<void()> const& cb) override
50
            std::function<void()> const& cb, std::function<void(mga::DisplayName)> const&) override
581
51
        {
51
        {
582
52
            hotplug_fn = cb;
52
            hotplug_fn = cb;
583
53
            return {};
53
            return {};
584
@@ -72,9 +72,9 @@
585
72
            return wrapped.active_attribs_for(d);
72
            return wrapped.active_attribs_for(d);
586
73
        } 
73
        } 
587
74
        mga::ConfigChangeSubscription subscribe_to_config_changes(
74
        mga::ConfigChangeSubscription subscribe_to_config_changes(
589
75
            std::function<void()> const& cb) override
75
            std::function<void()> const& hotplug, std::function<void(mga::DisplayName)> const& vsync) override
590
76
        {
76
        {
592
77
            return wrapped.subscribe_to_config_changes(cb);
77
            return wrapped.subscribe_to_config_changes(hotplug, vsync);
593
78
        }
78
        }
594
79
        mga::HwcConfiguration& wrapped;
79
        mga::HwcConfiguration& wrapped;
595
80
    };
80
    };
596
81
81
597
=== modified file 'tests/unit-tests/graphics/android/test_hwc_configuration.cpp'
598
--- tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2015-03-03 06:56:37 +0000
599
+++ tests/unit-tests/graphics/android/test_hwc_configuration.cpp	2015-03-04 14:36:55 +0000
600
@@ -228,17 +228,23 @@
601
228
    EXPECT_THAT(attribs.vrefresh_hz, Eq(0.0f));
228
    EXPECT_THAT(attribs.vrefresh_hz, Eq(0.0f));
602
229
}
229
}
603
230
230
605
231
TEST_F(HwcConfiguration, subscribes_to_hotplug)
231
TEST_F(HwcConfiguration, subscribes_to_hotplug_and_vsync)
606
232
{
232
{
607
233
    using namespace testing;
233
    using namespace testing;
608
234
    std::function<void(mga::DisplayName, bool)> hotplug_fn([](mga::DisplayName, bool){});
234
    std::function<void(mga::DisplayName, bool)> hotplug_fn([](mga::DisplayName, bool){});
609
235
    std::function<void(mga::DisplayName, std::chrono::nanoseconds)> vsync_fn(
610
236
        [](mga::DisplayName, std::chrono::nanoseconds){});
611
235
    EXPECT_CALL(*mock_hwc_wrapper, subscribe_to_events(_,_,_,_))
237
    EXPECT_CALL(*mock_hwc_wrapper, subscribe_to_events(_,_,_,_))
613
236
        .WillOnce(SaveArg<2>(&hotplug_fn));
238
        .WillOnce(DoAll(SaveArg<1>(&vsync_fn), SaveArg<2>(&hotplug_fn)));
614
237
    EXPECT_CALL(*mock_hwc_wrapper, unsubscribe_from_events_(_));
239
    EXPECT_CALL(*mock_hwc_wrapper, unsubscribe_from_events_(_));
615
238
240
621
239
    unsigned int call_count{0};
241
    unsigned int hotplug_call_count{0};
622
240
    auto subscription = config.subscribe_to_config_changes([&]{ call_count++; });
242
    unsigned int vsync_call_count{0};
623
241
    hotplug_fn(mga::DisplayName::primary, true);
243
    auto subscription = config.subscribe_to_config_changes(
624
242
    hotplug_fn(mga::DisplayName::primary, true);
244
        [&]{ hotplug_call_count++; }, [&](mga::DisplayName){ vsync_call_count++; });
625
243
    EXPECT_THAT(call_count, Eq(2));
245
    hotplug_fn(mga::DisplayName::primary, true);
626
246
    hotplug_fn(mga::DisplayName::primary, true);
627
247
    vsync_fn(mga::DisplayName::primary, std::chrono::nanoseconds(33));
628
248
    EXPECT_THAT(hotplug_call_count, Eq(2));
629
249
    EXPECT_THAT(vsync_call_count, Eq(1));
630
244
}
250
}
631
245
251
632
=== modified file 'tests/unit-tests/graphics/mesa/test_display.cpp'
633
--- tests/unit-tests/graphics/mesa/test_display.cpp	2015-02-26 03:20:09 +0000
634
+++ tests/unit-tests/graphics/mesa/test_display.cpp	2015-03-04 14:36:55 +0000
635
@@ -28,6 +28,7 @@
636
28
28
637
29
#include "mir_test_doubles/mock_egl.h"
29
#include "mir_test_doubles/mock_egl.h"
638
30
#include "mir_test_doubles/mock_gl.h"
30
#include "mir_test_doubles/mock_gl.h"
639
31
#include "mir_test_doubles/advanceable_clock.h"
640
31
#include "src/server/report/null_report_factory.h"
32
#include "src/server/report/null_report_factory.h"
641
32
#include "mir_test_doubles/mock_display_report.h"
33
#include "mir_test_doubles/mock_display_report.h"
642
33
#include "mir_test_doubles/null_virtual_terminal.h"
34
#include "mir_test_doubles/null_virtual_terminal.h"
643
@@ -525,7 +526,7 @@
644
525
    using namespace ::testing;
526
    using namespace ::testing;
645
526
527
646
527
    auto logger = std::make_shared<MockLogger>();
528
    auto logger = std::make_shared<MockLogger>();
648
528
    auto reporter = std::make_shared<mrl::DisplayReport>(logger);
529
    auto reporter = std::make_shared<mrl::DisplayReport>(logger, std::make_shared<mtd::AdvanceableClock>());
649
529
530
650
530
    EXPECT_CALL(
531
    EXPECT_CALL(
651
531
        *logger,
532
        *logger,
652
@@ -541,7 +542,7 @@
653
541
    using namespace ::testing;
542
    using namespace ::testing;
654
542
543
655
543
    auto logger = std::make_shared<MockLogger>();
544
    auto logger = std::make_shared<MockLogger>();
657
544
    auto reporter = std::make_shared<mrl::DisplayReport>(logger);
545
    auto reporter = std::make_shared<mrl::DisplayReport>(logger, std::make_shared<mtd::AdvanceableClock>());
658
545
546
659
546
    EXPECT_CALL(
547
    EXPECT_CALL(
660
547
        *logger,
548
        *logger,
661
@@ -557,7 +558,7 @@
662
557
    using namespace ::testing;
558
    using namespace ::testing;
663
558
559
664
559
    auto logger = std::make_shared<MockLogger>();
560
    auto logger = std::make_shared<MockLogger>();
666
560
    auto reporter = std::make_shared<mrl::DisplayReport>(logger);
561
    auto reporter = std::make_shared<mrl::DisplayReport>(logger, std::make_shared<mtd::AdvanceableClock>());
667
561
562
668
562
    EXPECT_CALL(
563
    EXPECT_CALL(
669
563
        *logger,
564
        *logger,
670
@@ -573,7 +574,7 @@
671
573
    using namespace ::testing;
574
    using namespace ::testing;
672
574
575
673
575
    auto logger = std::make_shared<MockLogger>();
576
    auto logger = std::make_shared<MockLogger>();
675
576
    auto reporter = std::make_shared<mrl::DisplayReport>(logger);
577
    auto reporter = std::make_shared<mrl::DisplayReport>(logger, std::make_shared<mtd::AdvanceableClock>());
676
577
578
677
578
    EXPECT_CALL(
579
    EXPECT_CALL(
678
579
        *logger,
580
        *logger,
679
580
581
680
=== modified file 'tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp'
681
--- tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp	2015-01-22 09:00:14 +0000
682
+++ tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp	2015-03-04 14:36:55 +0000
683
@@ -45,10 +45,11 @@
684
45
{
45
{
685
46
public:
46
public:
686
47
    KMSPageFlipperTest()
47
    KMSPageFlipperTest()
688
48
        : page_flipper{mock_drm.fake_drm.fd()}
48
        : page_flipper{mock_drm.fake_drm.fd(), mt::fake_shared(report)}
689
49
    {
49
    {
690
50
    }
50
    }
691
51
51
692
52
    testing::NiceMock<mtd::MockDisplayReport> report;
693
52
    testing::NiceMock<mtd::MockDRM> mock_drm;
53
    testing::NiceMock<mtd::MockDRM> mock_drm;
694
53
    mgm::KMSPageFlipper page_flipper;
54
    mgm::KMSPageFlipper page_flipper;
695
54
};
55
};
696
@@ -121,6 +122,24 @@
697
121
    page_flipper.wait_for_flip(crtc_id);
122
    page_flipper.wait_for_flip(crtc_id);
698
122
}
123
}
699
123
124
700
125
TEST_F(KMSPageFlipperTest, wait_for_flip_reports_vsync)
701
126
{
702
127
    using namespace testing;
703
128
    uint32_t const crtc_id{10};
704
129
    uint32_t const fb_id{101};
705
130
    void* user_data{nullptr};
706
131
    ON_CALL(mock_drm, drmModePageFlip(_, _, _, _, _))
707
132
        .WillByDefault(DoAll(SaveArg<4>(&user_data), Return(0)));
708
133
    ON_CALL(mock_drm, drmHandleEvent(_, _))
709
134
        .WillByDefault(DoAll(InvokePageFlipHandler(&user_data), Return(0)));
710
135
711
136
    EXPECT_CALL(report, report_vsync(crtc_id));
712
137
713
138
    page_flipper.schedule_flip(crtc_id, fb_id);
714
139
    EXPECT_EQ(1, write(mock_drm.fake_drm.write_fd(), "a", 1));
715
140
    page_flipper.wait_for_flip(crtc_id);
716
141
}
717
142
718
124
TEST_F(KMSPageFlipperTest, wait_for_non_scheduled_page_flip_doesnt_block)
143
TEST_F(KMSPageFlipperTest, wait_for_non_scheduled_page_flip_doesnt_block)
719
125
{
144
{
720
126
    using namespace testing;
145
    using namespace testing;
721
127
146
722
=== modified file 'tests/unit-tests/logging/test_display_report.cpp'
723
--- tests/unit-tests/logging/test_display_report.cpp	2015-01-21 07:34:50 +0000
724
+++ tests/unit-tests/logging/test_display_report.cpp	2015-03-04 14:36:55 +0000
725
@@ -19,6 +19,7 @@
726
19
#include "src/server/report/logging/display_report.h"
19
#include "src/server/report/logging/display_report.h"
727
20
#include "mir/logging/logger.h"
20
#include "mir/logging/logger.h"
728
21
#include "mir_test_doubles/mock_egl.h"
21
#include "mir_test_doubles/mock_egl.h"
729
22
#include "mir_test_doubles/advanceable_clock.h"
730
22
23
731
23
#include <gtest/gtest.h>
24
#include <gtest/gtest.h>
732
24
#include <gmock/gmock.h>
25
#include <gmock/gmock.h>
733
@@ -39,16 +40,8 @@
734
39
40
735
40
struct DisplayReport : public testing::Test
41
struct DisplayReport : public testing::Test
736
41
{
42
{
747
42
    DisplayReport()
43
    std::shared_ptr<mtd::AdvanceableClock> const clock{std::make_shared<mtd::AdvanceableClock>()};
748
43
    {
44
    std::shared_ptr<MockLogger> logger{std::make_shared<MockLogger>()};
739
44
    }
740
45
741
46
    void SetUp()
742
47
    {
743
48
        logger = std::make_shared<MockLogger>();
744
49
    }
745
50
746
51
    std::shared_ptr<MockLogger> logger;
749
52
    mtd::MockEGL mock_egl;
45
    mtd::MockEGL mock_egl;
750
53
};
46
};
751
54
47
752
@@ -123,6 +116,29 @@
753
123
            component));
116
            component));
754
124
    }
117
    }
755
125
118
757
126
    mrl::DisplayReport report(logger);
119
    mrl::DisplayReport report(logger, clock);
758
127
    report.report_egl_configuration(disp, config);
120
    report.report_egl_configuration(disp, config);
759
128
}
121
}
760
122
761
123
TEST_F(DisplayReport, reports_vsync)
762
124
{
763
125
    std::chrono::milliseconds interval(1500);
764
126
    unsigned int display1_id {1223};
765
127
    unsigned int display2_id {4492};
766
128
    std::string display1_name(std::to_string(display1_id));
767
129
    std::string display2_name(std::to_string(display2_id));
768
130
    EXPECT_CALL(*logger, log(
769
131
        ml::Severity::informational,
770
132
        "2 vsync events on [" + display1_name + "] over " + std::to_string(interval.count()) + "ms",
771
133
        component));
772
134
    EXPECT_CALL(*logger, log(
773
135
        ml::Severity::informational,
774
136
        "1 vsync events on [" + display2_name + "] over " + std::to_string(interval.count()) + "ms",
775
137
        component));
776
138
    mrl::DisplayReport report(logger, clock);
777
139
778
140
    report.report_vsync(display1_id);
779
141
    report.report_vsync(display2_id);
780
142
    clock->advance_by(interval);
781
143
    report.report_vsync(display1_id);
782
144
}
Status:	Merged
Approved by:	Kevin DuBois on 2015-03-04
Approved revision:	no longer in the source branch.
Merged at revision:	2361
Proposed branch:	lp:~kdub/mir/report-vsync
Merge into:	lp:mir
Diff against target:	782 lines (+228/-89) 26 files modified src/include/platform/mir/graphics/display_report.h (+2/-0) src/platforms/android/server/display.cpp (+9/-1) src/platforms/android/server/display.h (+2/-0) src/platforms/android/server/fb_device.cpp (+3/-1) src/platforms/android/server/fb_device.h (+3/-1) src/platforms/android/server/hwc_blanking_control.cpp (+4/-3) src/platforms/android/server/hwc_configuration.h (+6/-2) src/platforms/mesa/server/display.cpp (+1/-1) src/platforms/mesa/server/kms_page_flipper.cpp (+19/-10) src/platforms/mesa/server/kms_page_flipper.h (+5/-2) src/server/report/logging/display_report.cpp (+26/-1) src/server/report/logging/display_report.h (+24/-13) src/server/report/logging/logging_report_factory.cpp (+1/-1) src/server/report/lttng/display_report.cpp (+2/-6) src/server/report/lttng/display_report.h (+10/-11) src/server/report/lttng/display_report_tp.h (+9/-0) src/server/report/null/display_report.cpp (+1/-0) src/server/report/null/display_report.h (+1/-0) tests/include/mir_test_doubles/mock_display_report.h (+1/-2) tests/include/mir_test_doubles/stub_display_builder.h (+5/-4) tests/unit-tests/graphics/android/test_display.cpp (+26/-4) tests/unit-tests/graphics/android/test_display_hotplug.cpp (+3/-3) tests/unit-tests/graphics/android/test_hwc_configuration.cpp (+13/-7) tests/unit-tests/graphics/mesa/test_display.cpp (+5/-4) tests/unit-tests/graphics/mesa/test_kms_page_flipper.cpp (+20/-1) tests/unit-tests/logging/test_display_report.cpp (+27/-11)
To merge this branch:	bzr merge lp:~kdub/mir/report-vsync
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-03-04
Robert Carr (community)			Approve on 2015-03-04
Alan Griffiths			Approve on 2015-03-04
Andreas Pokorny (community)			Approve on 2015-03-04
Alexandros Frantzis (community)			Approve on 2015-03-04
Daniel van Vugt		2015-03-02	Abstain on 2015-03-03
Review via email: mp+251532@code.launchpad.net