Merge lp:~alan-griffiths/mir/configurable-DisplayConfigurationReport into lp:mir

[Alan Griffiths]

graphics, report: Make the DisplayConfigurationReport configurable

graphics, report: Make the DisplayConfigurationReport configurable

I plan to use this reporting mechanism in tests that track configuration changes in nested servers.

[Kevin DuBois (kdub)]

lgtm, although I'm not quite sure the value in distinguishing the initial configuration from the subsequent ones. I had the thought that some of the ported printing code could use the geom::Length::Unit::inches for conversions, but thats pre-existing.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2904
http://jenkins.qa.ubuntu.com/job/mir-ci/4768/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3788/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2699
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3738/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/917
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/917/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3738
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3738/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6473/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22962

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4768/rebuild

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1830/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3815
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3761
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/383/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3761
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3761/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6496
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23044

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

CI hiccup --> "No space left on device"

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1832/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3821
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/mir-clang-ts-vivid-amd64-build/239/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/385
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/385/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3767
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3767/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6500
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23053

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/1833/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/3829
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/2736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/3775
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/386/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3775
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/3775/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/6507
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23077

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/386/console

^ Failed because the slave ran out of disk space. The slave has been taken offline and will be fixed. I'll reapprove this MP as it failed due to an infrastructure issue.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'include/common/mir/logging/logger.h'
--- include/common/mir/logging/logger.h	2015-02-22 07:46:25 +0000
+++ include/common/mir/logging/logger.h	2015-09-01 16:52:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2014 Canonical Ltd.
+ * Copyright © 2012-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -45,6 +45,8 @@
                      const std::string& message,
                      const std::string& component) = 0;
 
+    virtual void log(char const* component, Severity severity, char const* format, ...);
+
 protected:
     Logger() {}
     virtual ~Logger() = default;

=== added file 'include/server/mir/graphics/display_configuration_report.h'
--- include/server/mir/graphics/display_configuration_report.h	1970-01-01 00:00:00 +0000
+++ include/server/mir/graphics/display_configuration_report.h	2015-09-01 16:52:14 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_DISPLAY_CONFIGURATION_REPORT_H
+#define MIR_GRAPHICS_DISPLAY_CONFIGURATION_REPORT_H
+
+namespace mir
+{
+namespace graphics
+{
+class DisplayConfiguration;
+
+class DisplayConfigurationReport
+{
+public:
+    virtual void initial_configuration(DisplayConfiguration const& configuration) = 0;
+    virtual void new_configuration(DisplayConfiguration const& configuration) = 0;
+
+protected:
+    DisplayConfigurationReport() = default;
+    virtual ~DisplayConfigurationReport() = default;
+    DisplayConfigurationReport(DisplayConfigurationReport const& ) = delete;
+    DisplayConfigurationReport& operator=(DisplayConfigurationReport const& ) = delete;
+};
+}
+}
+
+#endif //MIR_GRAPHICS_DISPLAY_CONFIGURATION_REPORT_H

=== modified file 'include/server/mir/server.h'
--- include/server/mir/server.h	2015-06-18 04:38:28 +0000
+++ include/server/mir/server.h	2015-09-01 16:52:14 +0000
@@ -30,7 +30,7 @@
 {
 namespace compositor { class Compositor; class DisplayBufferCompositorFactory; }
 namespace frontend { class SessionAuthorizer; class Session; class SessionMediatorReport; }
-namespace graphics { class Cursor; class Platform; class Display; class GLConfig; class DisplayConfigurationPolicy; }
+namespace graphics { class Cursor; class Platform; class Display; class GLConfig; class DisplayConfigurationPolicy; class DisplayConfigurationReport; }
 namespace input { class CompositeEventFilter; class InputDispatcher; class CursorListener; class TouchVisualizer; class InputDeviceHub;}
 namespace logging { class Logger; }
 namespace options { class Option; }
@@ -216,6 +216,10 @@
     void override_the_display_buffer_compositor_factory(
         Builder<compositor::DisplayBufferCompositorFactory> const& compositor_builder);
 
+    /// Sets an override functor for creating the display configuration report.
+    void override_the_display_configuration_report(
+        Builder<graphics::DisplayConfigurationReport> const& report_builder);
+
     /// Sets an override functor for creating the gl config.
     void override_the_gl_config(Builder<graphics::GLConfig> const& gl_config_builder);
 

=== modified file 'src/common/logging/logger.cpp'
--- src/common/logging/logger.cpp	2015-06-17 05:20:42 +0000
+++ src/common/logging/logger.cpp	2015-09-01 16:52:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014 Canonical Ltd.
+ * Copyright © 2014-2015 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 3,
@@ -20,9 +20,24 @@
 #include "mir/logging/logger.h"
 
 #include <mutex>
+#include <cstdarg>
+#include <cstdio>
 
 namespace ml = mir::logging;
 
+void ml::Logger::log(char const* component, Severity severity, char const* format, ...)
+{
+    auto const bufsize = 4096;
+    va_list va;
+    va_start(va, format);
+    char message[bufsize];
+    vsnprintf(message, bufsize, format, va);
+    va_end(va);
+
+    // Inefficient, but maintains API: Constructing a std::string for message/component.
+    log(severity, std::string{message}, std::string{component});
+}
+
 namespace
 {
 std::mutex log_mutex;

=== modified file 'src/common/symbols.map'
--- src/common/symbols.map	2015-08-27 08:30:54 +0000
+++ src/common/symbols.map	2015-09-01 16:52:14 +0000
@@ -205,5 +205,6 @@
       mir::dispatch::ReadableFd::watch_fd*;
       mir::dispatch::ReadableFd::dispatch*;
       mir::dispatch::ReadableFd::relevant_events*;
+      mir::logger::Logger::log*;
     };
 } MIR_COMMON_5.1;

=== modified file 'src/include/server/mir/default_server_configuration.h'
--- src/include/server/mir/default_server_configuration.h	2015-07-20 02:48:17 +0000
+++ src/include/server/mir/default_server_configuration.h	2015-09-01 16:52:14 +0000
@@ -114,6 +114,7 @@
 class Platform;
 class Display;
 class DisplayReport;
+class DisplayConfigurationReport;
 class GraphicBufferAllocator;
 class Cursor;
 class CursorImage;
@@ -214,6 +215,7 @@
     virtual std::shared_ptr<graphics::Cursor> the_cursor();
     virtual std::shared_ptr<graphics::CursorImage> the_default_cursor_image();
     virtual std::shared_ptr<input::CursorImages> the_cursor_images();
+    virtual std::shared_ptr<graphics::DisplayConfigurationReport> the_display_configuration_report();
 
     /** @} */
 
@@ -420,6 +422,7 @@
     CachedPtr<compositor::CompositorReport> compositor_report;
     CachedPtr<logging::Logger> logger;
     CachedPtr<graphics::DisplayReport> display_report;
+    CachedPtr<graphics::DisplayConfigurationReport> display_configuration_report;
     CachedPtr<time::Clock> clock;
     CachedPtr<MainLoop> main_loop;
     CachedPtr<ServerStatusListener> server_status_listener;

=== modified file 'src/server/report/default_server_configuration.cpp'
--- src/server/report/default_server_configuration.cpp	2015-04-28 07:54:10 +0000
+++ src/server/report/default_server_configuration.cpp	2015-09-01 16:52:14 +0000
@@ -24,6 +24,7 @@
 #include "null_report_factory.h"
 
 #include "mir/abnormal_exit.h"
+#include "logging/display_configuration_report.h"
 
 namespace mg = mir::graphics;
 namespace mf = mir::frontend;
@@ -100,6 +101,14 @@
         });
 }
 
+auto mir::DefaultServerConfiguration::the_display_configuration_report() -> std::shared_ptr<mg::DisplayConfigurationReport>
+{
+    return display_configuration_report([this]() -> std::shared_ptr<mg::DisplayConfigurationReport>
+        {
+            return std::make_shared<mir::report::logging::DisplayConfigurationReport>(the_logger());
+        });
+}
+
 auto mir::DefaultServerConfiguration::the_input_report() -> std::shared_ptr<mi::InputReport>
 {
     return input_report(

=== modified file 'src/server/report/logging/CMakeLists.txt'
--- src/server/report/logging/CMakeLists.txt	2015-02-22 07:46:25 +0000
+++ src/server/report/logging/CMakeLists.txt	2015-09-01 16:52:14 +0000
@@ -11,7 +11,7 @@
   compositor_report.cpp
   scene_report.cpp
   logging_report_factory.cpp
-)
+  display_configuration_report.cpp)
 
 add_library(
   mirlogging OBJECT

=== added file 'src/server/report/logging/display_configuration_report.cpp'
--- src/server/report/logging/display_configuration_report.cpp	1970-01-01 00:00:00 +0000
+++ src/server/report/logging/display_configuration_report.cpp	2015-09-01 16:52:14 +0000
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#include "display_configuration_report.h"
+#include "mir/graphics/display_configuration.h"
+
+#include "mir/logging/logger.h"
+
+#include <cmath>
+
+namespace mg = mir::graphics;
+namespace ml = mir::logging;
+namespace mrl= mir::report::logging;
+
+namespace 
+{
+auto const component = MIR_LOG_COMPONENT_FALLBACK;
+auto const severity  = ml::Severity::informational;
+}
+
+mrl::DisplayConfigurationReport::DisplayConfigurationReport(std::shared_ptr<ml::Logger> const& logger) :
+    logger{logger}
+{
+}
+
+mrl::DisplayConfigurationReport::~DisplayConfigurationReport()
+{
+}
+
+void mrl::DisplayConfigurationReport::initial_configuration(mg::DisplayConfiguration const& configuration)
+{
+    logger->log(component, severity, "Initial display configuration:");
+    log_configuration(configuration);
+}
+
+void mrl::DisplayConfigurationReport::new_configuration(mg::DisplayConfiguration const& configuration)
+{
+    logger->log(component, severity, "New display configuration:");
+    log_configuration(configuration);
+}
+
+void mrl::DisplayConfigurationReport::log_configuration(mg::DisplayConfiguration const& configuration) const
+{
+    configuration.for_each_output([this](mg::DisplayConfigurationOutput const& out)
+    {
+        static const char* const type_str[] =
+            {"Unknown", "VGA", "DVI-I", "DVI-D", "DVI-A", "Composite",
+             "S-Video", "LVDS", "Component", "9-pin-DIN", "DisplayPort",
+             "HDMI-A", "HDMI-B", "TV", "eDP"};
+        auto type = type_str[static_cast<int>(out.type)];
+        int out_id = out.id.as_value();
+        int card_id = out.card_id.as_value();
+        const char prefix[] = "  ";
+
+        if (out.connected)
+        {
+            int width_mm = out.physical_size_mm.width.as_int();
+            int height_mm = out.physical_size_mm.height.as_int();
+            float inches =
+                sqrtf(width_mm * width_mm + height_mm * height_mm) / 25.4;
+            int indent = 0;
+
+            logger->log(component, severity, 
+                        "%s%d.%d: %n%s %.1f\" %dx%dmm",
+                        prefix, card_id, out_id, &indent, type,
+                        inches, width_mm, height_mm);
+            
+            if (out.used)
+            {
+                if (out.current_mode_index < out.modes.size())
+                {
+                    auto const& mode = out.modes[out.current_mode_index];
+                    logger->log(component, severity,
+                                "%*cCurrent mode %dx%d %.2fHz",
+                                indent, ' ',
+                                mode.size.width.as_int(),
+                                mode.size.height.as_int(),
+                                mode.vrefresh_hz);
+                }
+                
+                if (out.preferred_mode_index < out.modes.size())
+                {
+                    auto const& mode = out.modes[out.preferred_mode_index];
+                    logger->log(component, severity,
+                                "%*cPreferred mode %dx%d %.2fHz",
+                                indent, ' ',
+                                mode.size.width.as_int(),
+                                mode.size.height.as_int(),
+                                mode.vrefresh_hz);
+                }
+                
+                logger->log(component, severity,
+                            "%*cLogical position %+d%+d",
+                            indent, ' ',
+                            out.top_left.x.as_int(),
+                            out.top_left.y.as_int());
+            }
+            else
+            {
+                logger->log(component, severity,
+                            "%*cDisabled", indent, ' ');
+            }
+        }
+        else
+        {
+            logger->log(component, severity,
+                        "%s%d.%d: unused %s", prefix, card_id, out_id, type);
+        }
+    });
+}

=== added file 'src/server/report/logging/display_configuration_report.h'
--- src/server/report/logging/display_configuration_report.h	1970-01-01 00:00:00 +0000
+++ src/server/report/logging/display_configuration_report.h	2015-09-01 16:52:14 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef MIR_DISPLAYCONFIGURATIONREPORT_H
+#define MIR_DISPLAYCONFIGURATIONREPORT_H
+
+#include "mir/graphics/display_configuration_report.h"
+
+#include <memory>
+
+namespace mir
+{
+namespace logging { class Logger; }
+
+namespace report
+{
+namespace logging
+{
+class DisplayConfigurationReport : public mir::graphics::DisplayConfigurationReport
+{
+public:
+    DisplayConfigurationReport(std::shared_ptr<mir::logging::Logger> const& logger);
+    ~DisplayConfigurationReport();
+
+    virtual void initial_configuration(graphics::DisplayConfiguration const& configuration) override;
+
+    virtual void new_configuration(graphics::DisplayConfiguration const& configuration) override;
+
+private:
+    void log_configuration(graphics::DisplayConfiguration const& configuration) const;
+    std::shared_ptr<mir::logging::Logger> const logger;
+};
+}
+}
+}
+
+#endif //MIR_DISPLAYCONFIGURATIONREPORT_H

=== modified file 'src/server/scene/default_configuration.cpp'
--- src/server/scene/default_configuration.cpp	2015-06-18 04:38:28 +0000
+++ src/server/scene/default_configuration.cpp	2015-09-01 16:52:14 +0000
@@ -135,7 +135,8 @@
                 the_display_configuration_policy(),
                 the_session_container(),
                 the_session_event_handler_register(),
-                the_server_action_queue());
+                the_server_action_queue(),
+                the_display_configuration_report());
         });
 
 }

=== modified file 'src/server/scene/mediating_display_changer.cpp'
--- src/server/scene/mediating_display_changer.cpp	2015-08-28 05:21:26 +0000
+++ src/server/scene/mediating_display_changer.cpp	2015-09-01 16:52:14 +0000
@@ -24,9 +24,8 @@
 #include "mir/compositor/compositor.h"
 #include "mir/graphics/display_configuration_policy.h"
 #include "mir/graphics/display_configuration.h"
+#include "mir/graphics/display_configuration_report.h"
 #include "mir/server_action_queue.h"
-#include "mir/log.h"
-#include <cmath>
 
 namespace mf = mir::frontend;
 namespace ms = mir::scene;
@@ -57,67 +56,6 @@
 
     std::function<void()> const revert;
 };
-
-void log_configuration(mg::DisplayConfiguration const& conf)
-{
-    conf.for_each_output([](mg::DisplayConfigurationOutput const& out)
-    {
-        static const char* const type_str[] =
-            {"Unknown", "VGA", "DVI-I", "DVI-D", "DVI-A", "Composite",
-             "S-Video", "LVDS", "Component", "9-pin-DIN", "DisplayPort",
-             "HDMI-A", "HDMI-B", "TV", "eDP"};
-        auto type = type_str[static_cast<int>(out.type)];
-        int out_id = out.id.as_value();
-        int card_id = out.card_id.as_value();
-        const char prefix[] = "  ";
-
-        if (out.connected)
-        {
-            int width_mm = out.physical_size_mm.width.as_int();
-            int height_mm = out.physical_size_mm.height.as_int();
-            float inches =
-                sqrtf(width_mm * width_mm + height_mm * height_mm) / 25.4;
-            int indent = 0;
-            mir::log_info("%s%d.%d: %n%s %.1f\" %dx%dmm",
-                          prefix, card_id, out_id, &indent, type,
-                          inches, width_mm, height_mm);
-            if (out.used)
-            {
-                if (out.current_mode_index < out.modes.size())
-                {
-                    auto const& mode = out.modes[out.current_mode_index];
-                    mir::log_info("%*cCurrent mode %dx%d %.2fHz",
-                                  indent, ' ',
-                                  mode.size.width.as_int(),
-                                  mode.size.height.as_int(),
-                                  mode.vrefresh_hz);
-                }
-                if (out.preferred_mode_index < out.modes.size())
-                {
-                    auto const& mode = out.modes[out.preferred_mode_index];
-                    mir::log_info("%*cPreferred mode %dx%d %.2fHz",
-                                  indent, ' ',
-                                  mode.size.width.as_int(),
-                                  mode.size.height.as_int(),
-                                  mode.vrefresh_hz);
-                }
-                mir::log_info("%*cLogical position %+d%+d",
-                              indent, ' ',
-                              out.top_left.x.as_int(),
-                              out.top_left.y.as_int());
-            }
-            else
-            {
-                mir::log_info("%*cDisabled", indent, ' ');
-            }
-        }
-        else
-        {
-            mir::log_info("%s%d.%d: unused %s", prefix, card_id, out_id, type);
-        }
-    });
-}
-
 }
 
 ms::MediatingDisplayChanger::MediatingDisplayChanger(
@@ -126,13 +64,15 @@
     std::shared_ptr<mg::DisplayConfigurationPolicy> const& display_configuration_policy,
     std::shared_ptr<SessionContainer> const& session_container,
     std::shared_ptr<SessionEventHandlerRegister> const& session_event_handler_register,
-    std::shared_ptr<ServerActionQueue> const& server_action_queue)
+    std::shared_ptr<ServerActionQueue> const& server_action_queue,
+    std::shared_ptr<mg::DisplayConfigurationReport> const& report)
     : display{display},
       compositor{compositor},
       display_configuration_policy{display_configuration_policy},
       session_container{session_container},
       session_event_handler_register{session_event_handler_register},
       server_action_queue{server_action_queue},
+      report{report},
       base_configuration{display->configuration()},
       base_configuration_applied{true}
 {
@@ -169,8 +109,8 @@
                         session_stopping_handler(session);
                 });
         });
-    mir::log_info("Initial display configuration:");
-    log_configuration(*base_configuration);
+
+    report->initial_configuration(*base_configuration);
 }
 
 void ms::MediatingDisplayChanger::configure(
@@ -241,8 +181,7 @@
     std::shared_ptr<graphics::DisplayConfiguration> const& conf,
     SystemStateHandling pause_resume_system)
 {
-    mir::log_info("New display configuration:");
-    log_configuration(*conf);
+    report->new_configuration(*conf);
     if (pause_resume_system)
     {
         ApplyNowAndRevertOnScopeExit comp{

=== modified file 'src/server/scene/mediating_display_changer.h'
--- src/server/scene/mediating_display_changer.h	2015-02-22 07:46:25 +0000
+++ src/server/scene/mediating_display_changer.h	2015-09-01 16:52:14 +0000
@@ -33,6 +33,7 @@
 {
     class Display;
     class DisplayConfigurationPolicy;
+    class DisplayConfigurationReport;
 }
 namespace compositor { class Compositor; }
 namespace scene
@@ -51,7 +52,8 @@
         std::shared_ptr<graphics::DisplayConfigurationPolicy> const& display_configuration_policy,
         std::shared_ptr<SessionContainer> const& session_container,
         std::shared_ptr<SessionEventHandlerRegister> const& session_event_handler_register,
-        std::shared_ptr<ServerActionQueue> const& server_action_queue);
+        std::shared_ptr<ServerActionQueue> const& server_action_queue,
+        std::shared_ptr<graphics::DisplayConfigurationReport> const& report);
 
     /* From mir::frontend::DisplayChanger */
     std::shared_ptr<graphics::DisplayConfiguration> active_configuration() override;
@@ -83,6 +85,7 @@
     std::shared_ptr<SessionContainer> const session_container;
     std::shared_ptr<SessionEventHandlerRegister> const session_event_handler_register;
     std::shared_ptr<ServerActionQueue> const server_action_queue;
+    std::shared_ptr<graphics::DisplayConfigurationReport> const report;
     std::mutex configuration_mutex;
     std::map<std::weak_ptr<frontend::Session>,
              std::shared_ptr<graphics::DisplayConfiguration>,

=== modified file 'src/server/server.cpp'
--- src/server/server.cpp	2015-06-18 04:38:28 +0000
+++ src/server/server.cpp	2015-09-01 16:52:14 +0000
@@ -48,6 +48,7 @@
 #define FOREACH_OVERRIDE(MACRO)\
     MACRO(compositor)\
     MACRO(display_buffer_compositor_factory)\
+    MACRO(display_configuration_report)\
     MACRO(gl_config)\
     MACRO(host_lifecycle_event_listener)\
     MACRO(input_dispatcher)\

=== modified file 'src/server/symbols.map'
--- src/server/symbols.map	2015-07-25 08:10:48 +0000
+++ src/server/symbols.map	2015-09-01 16:52:14 +0000
@@ -145,6 +145,7 @@
     mir::Server::override_the_application_not_responding_detector*;
     mir::Server::override_the_compositor*;
     mir::Server::override_the_display_buffer_compositor_factory*;
+    mir::Server::override_the_display_configuration_report*;
     mir::Server::override_the_gl_config*;
     mir::Server::override_the_host_lifecycle_event_listener*;
     mir::Server::override_the_input_dispatcher*;

=== modified file 'tests/unit-tests/scene/test_mediating_display_changer.cpp'
--- tests/unit-tests/scene/test_mediating_display_changer.cpp	2015-06-25 03:00:08 +0000
+++ tests/unit-tests/scene/test_mediating_display_changer.cpp	2015-09-01 16:52:14 +0000
@@ -19,6 +19,7 @@
 #include "src/server/scene/mediating_display_changer.h"
 #include "src/server/scene/session_container.h"
 #include "mir/graphics/display_configuration_policy.h"
+#include "mir/graphics/display_configuration_report.h"
 #include "src/server/scene/broadcasting_session_event_sink.h"
 #include "mir/server_action_queue.h"
 
@@ -120,6 +121,13 @@
     MOCK_METHOD1(resume_processing_for, void(void const*));
 };
 
+struct StubDisplayConfigurationReport : mg::DisplayConfigurationReport
+{
+    void initial_configuration(mg::DisplayConfiguration const&) override {}
+    void new_configuration(mg::DisplayConfiguration const&) override {}
+};
+
+
 struct MediatingDisplayChangerTest : public ::testing::Test
 {
     MediatingDisplayChangerTest()
@@ -132,7 +140,8 @@
                       mt::fake_shared(mock_conf_policy),
                       mt::fake_shared(stub_session_container),
                       mt::fake_shared(session_event_sink),
-                      mt::fake_shared(server_action_queue));
+                      mt::fake_shared(server_action_queue),
+                      mt::fake_shared(display_configuration_report));
     }
 
     testing::NiceMock<MockDisplay> mock_display;
@@ -142,6 +151,7 @@
     ms::BroadcastingSessionEventSink session_event_sink;
     mtd::StubDisplayConfig base_config;
     StubServerActionQueue server_action_queue;
+    StubDisplayConfigurationReport display_configuration_report;
     std::shared_ptr<ms::MediatingDisplayChanger> changer;
 };
 
@@ -438,7 +448,8 @@
       mt::fake_shared(mock_conf_policy),
       mt::fake_shared(stub_session_container),
       mt::fake_shared(session_event_sink),
-      mt::fake_shared(mock_server_action_queue));
+      mt::fake_shared(mock_server_action_queue),
+      mt::fake_shared(display_configuration_report));
 
     void const* owner{nullptr};