Merge lp:~vanvugt/mir/log-power-mode into lp:mir

[Daniel van Vugt]

Log the current power mode of each output too.

I'm expecting this to be useful for debugging black screen issues
in future.

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3834
https://mir-jenkins.ubuntu.com/job/mir-ci/2230/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2887
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2952
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2944
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2944
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2944
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2916
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2916/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2916
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2916/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2916
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2916/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2916
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2916/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2916
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2916/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2916
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2916/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

To match coding style (and be slightly clearer) it'd be char const* const power_mode[].

I'd vaguely prefer a lookup function, but I don't expect us to actually change the power mode enum at any point.

Seems sensible.

review: Approve

=== modified file 'src/server/report/logging/display_configuration_report.cpp'
--- src/server/report/logging/display_configuration_report.cpp	2016-11-15 23:48:01 +0000
+++ src/server/report/logging/display_configuration_report.cpp	2016-11-21 10:02:14 +0000
@@ -94,6 +94,11 @@
             logger->log(component, severity, 
                         "%sPhysical size %.1f\" %dx%dmm",
                         indent, inches, width_mm, height_mm);
+
+            static const char* const power_mode[] =
+                {"on", "in standby", "suspended", "off"};
+            logger->log(component, severity,
+                        "%sPower is %s", indent, power_mode[out.power_mode]);
             
             if (out.used)
             {