Merge lp:~mir-team/mir/fix-1675331 into lp:mir

[Daniel van Vugt]

Don't use zero (mir_display_output_id_invalid) as a real output ID
(LP: #1675331)

The offending class is not under test at all, so that's why there
is no regression test right now. If that concerns anyone we could just
temporarily revert revision 4103 instead. Either way, I don't want to
be responsible for regression testing this one.

[Daniel van Vugt (vanvugt)]

On the other hand, it looks like the only user of mir_display_output_id_invalid is going to be deprecated. So we may not need this. But as a beautification of the output list, still nice to have...

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

PASSED: Continuous integration, rev:4111
https://mir-jenkins.ubuntu.com/job/mir-ci/3222/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4337
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4424
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4414
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4414
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4414
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4369
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4369/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/4369
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4369/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4369
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4369/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/4369
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4369/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/4369
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4369/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/4369
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4369/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Alan Griffiths (alan-griffiths)]

Sure

review: Approve

=== modified file 'src/platforms/mesa/server/kms/real_kms_display_configuration.cpp'
--- src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-03-22 07:01:56 +0000
+++ src/platforms/mesa/server/kms/real_kms_display_configuration.cpp	2017-03-23 10:14:53 +0000
@@ -95,10 +95,16 @@
     return std::make_unique<RealKMSDisplayConfiguration>(*this);
 }
 
+mgm::RealKMSDisplayConfiguration::Output const&
+mgm::RealKMSDisplayConfiguration::output(DisplayConfigurationOutputId id) const
+{
+    return outputs.at(id.as_value() - 1);
+}
+
 std::shared_ptr<mgm::KMSOutput> mgm::RealKMSDisplayConfiguration::get_output_for(
     DisplayConfigurationOutputId id) const
 {
-    return outputs.at(id.as_value()).second;
+    return output(id).second;
 }
 
 size_t mgm::RealKMSDisplayConfiguration::get_kms_mode_index(
@@ -109,7 +115,7 @@
     {
         BOOST_THROW_EXCEPTION(std::invalid_argument("Request for KMS mode index of invalid output ID"));
     }
-    if (conf_mode_index > outputs[id.as_value()].first.modes.size())
+    if (conf_mode_index > output(id).first.modes.size())
     {
         BOOST_THROW_EXCEPTION(std::invalid_argument("Request for out-of-bounds KMS mode index"));
     }
@@ -138,10 +144,9 @@
 {
     decltype(outputs) new_outputs;
 
-    int counter = 0;
     displays->update_from_hardware_state();
     displays->for_each_output(
-        [this, &new_outputs, &counter](auto const& output) mutable
+        [this, &new_outputs](auto const& output) mutable
         {
             DisplayConfigurationOutput mir_config;
 
@@ -163,10 +168,9 @@
             }
 
             output->update_from_hardware_state(mir_config);
-            mir_config.id = DisplayConfigurationOutputId{counter};
-            counter++;
+            mir_config.id = DisplayConfigurationOutputId{int(new_outputs.size() + 1)};
 
-            new_outputs.push_back(std::make_pair(mir_config, output));
+            new_outputs.emplace_back(mir_config, output);
         });
 
     outputs = new_outputs;

=== modified file 'src/platforms/mesa/server/kms/real_kms_display_configuration.h'
--- src/platforms/mesa/server/kms/real_kms_display_configuration.h	2017-03-10 10:20:24 +0000
+++ src/platforms/mesa/server/kms/real_kms_display_configuration.h	2017-03-23 10:14:53 +0000
@@ -55,7 +55,9 @@
 
     std::shared_ptr<KMSOutputContainer> displays;
     DisplayConfigurationCard card;
-    std::vector<std::pair< DisplayConfigurationOutput, std::shared_ptr<KMSOutput>>> outputs;
+    typedef std::pair<DisplayConfigurationOutput, std::shared_ptr<KMSOutput>> Output;
+    Output const& output(DisplayConfigurationOutputId id) const;
+    std::vector<Output> outputs;
 };
 
 bool compatible(RealKMSDisplayConfiguration const& conf1, RealKMSDisplayConfiguration const& conf2);