From d1f1cdda8c24dd8800aaa04c19c19bad7d02639d Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Fri, 6 Sep 2024 11:20:00 +1000
Subject: [PATCH 01/18] mir::SharedLibrary: Add a stable Handle for
 SharedLibrary

It can be useful to know if two `SharedLibrary` instances refer to the same DSO.
The new `SharedLibrary::Handle` implements such a comparable handle. This works
because `dlopen` guarantees that loading an already-loaded DSO returns the same
handle.
---
 include/common/mir/shared_library.h         | 17 ++++++++++++++++-
 src/common/sharedlibrary/shared_library.cpp | 16 ++++++++++++++++
 src/common/symbols.map                      |  6 +++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/include/common/mir/shared_library.h b/include/common/mir/shared_library.h
index 13c5b05da67..dd783d669da 100644
--- a/include/common/mir/shared_library.h
+++ b/include/common/mir/shared_library.h
@@ -17,6 +17,7 @@
 #ifndef MIR_SHARED_LIBRARY_H_
 #define MIR_SHARED_LIBRARY_H_
 
+#include <compare>
 #include <string>
 
 namespace mir
@@ -49,6 +50,21 @@ class SharedLibrary
         (void*&)result = load_symbol(function_name.c_str(), version.c_str());
         return result;
     }
+
+    class Handle
+    {
+    public:    
+        auto operator<=>(Handle const& rhs) const -> std::strong_ordering;
+        auto operator==(Handle const& rhs) const -> bool = default;
+        auto operator!=(Handle const& rhs) const -> bool = default;
+    private:
+        friend class SharedLibrary;
+
+        Handle(void* handle);
+        void* handle;
+    };
+
+    auto get_handle() const -> Handle;
 private:
     void* const so;
     void* load_symbol(char const* function_name) const;
@@ -58,5 +74,4 @@ class SharedLibrary
 };
 }
 
-
 #endif /* MIR_SHARED_LIBRARY_H_ */
diff --git a/src/common/sharedlibrary/shared_library.cpp b/src/common/sharedlibrary/shared_library.cpp
index ec41047c023..a76e9b010e4 100644
--- a/src/common/sharedlibrary/shared_library.cpp
+++ b/src/common/sharedlibrary/shared_library.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "mir/shared_library.h"
+#include <compare>
 
 #ifdef MIR_DONT_USE_DLVSYM
 #include <mir/log.h>
@@ -74,3 +75,18 @@ void* mir::SharedLibrary::load_symbol(char const* function_name, char const* ver
     }
 #endif
 }
+
+auto mir::SharedLibrary::get_handle() const -> Handle
+{
+    return Handle{so};
+}
+
+mir::SharedLibrary::Handle::Handle(void* handle)
+    : handle{handle}
+{
+}
+
+auto mir::SharedLibrary::Handle::operator<=>(Handle const& rhs) const -> std::strong_ordering
+{
+    return handle <=> rhs.handle;
+}
diff --git a/src/common/symbols.map b/src/common/symbols.map
index 3f73ccc844e..eb0b74ed64d 100644
--- a/src/common/symbols.map
+++ b/src/common/symbols.map
@@ -325,6 +325,9 @@ global:
     mir::SharedLibrary::?SharedLibrary*;
     mir::SharedLibrary::SharedLibrary*;
     mir::SharedLibrary::load_symbol*;
+    mir::SharedLibrary::get_handle*;
+    mir::SharedLibrary::Handle::?Handle*;
+    mir::SharedLibrary::Handle::operator*;
     mir::SharedLibraryProberReport::?SharedLibraryProberReport*;
     mir::SharedLibraryProberReport::SharedLibraryProberReport*;
     mir::SharedLibraryProberReport::operator*;
@@ -500,6 +503,7 @@ global:
     typeinfo?for?mir::NonBlockingExecutor;
     typeinfo?for?mir::PosixRWMutex;
     typeinfo?for?mir::SharedLibrary;
+    typeinfo?for?mir::SharedLibrary::Handle;
     typeinfo?for?mir::SharedLibraryProberReport;
     typeinfo?for?mir::Signal;
     typeinfo?for?mir::ThreadPoolExecutor;
@@ -695,4 +699,4 @@ MIR_COMMON_2.18 {
     MirTouchpadConfig::disable_with_external_mouse*;
     mir::event_type_to_c_str*;
   };
-} MIR_COMMON_2.17;
\ No newline at end of file
+} MIR_COMMON_2.17;

From 99aa10ad3024133d6db0c7c53d78d5f8085ab682 Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon, 9 Sep 2024 11:52:35 +1000
Subject: [PATCH 02/18] Configuration: Split options into global and per-module
 configuration.

This lets each module define its own options, without needing the option names
to be unique across all modules.

Also organises the module-specific options into their own sections at the end
of the help text.
---
 include/platform/mir/options/configuration.h  |  21 +-
 .../mir/options/default_configuration.h       |  48 ++++-
 include/platform/mir/options/program_option.h |   2 +-
 .../server/mir/default_server_configuration.h |   8 +-
 .../options/default_configuration.cpp         | 195 +++++++++++++++++-
 src/platform/options/program_option.cpp       |  21 +-
 src/server/default_server_configuration.cpp   |  11 +-
 src/server/graphics/default_configuration.cpp |  10 +-
 src/server/graphics/platform_probe.cpp        |  58 +++---
 src/server/graphics/platform_probe.h          |  12 +-
 src/server/server.cpp                         |   2 +-
 .../server_configuration_options.cpp          |  34 +++
 .../command_line_server_configuration.cpp     |   1 -
 .../graphics/test_platform_prober.cpp         |  75 ++++---
 .../options/test_program_option.cpp           |  22 --
 15 files changed, 399 insertions(+), 121 deletions(-)

diff --git a/include/platform/mir/options/configuration.h b/include/platform/mir/options/configuration.h
index f4af7a7af28..f37a2bbf5be 100644
--- a/include/platform/mir/options/configuration.h
+++ b/include/platform/mir/options/configuration.h
@@ -23,6 +23,8 @@
 
 namespace mir
 {
+class SharedLibrary;
+
 namespace options
 {
 extern char const* const arw_server_socket_opt;
@@ -66,17 +68,24 @@ extern char const* const auto_console;
 
 extern char const* const vt_option_name;
 
-class Configuration
+class OptionsProvider
 {
 public:
-    virtual std::shared_ptr<options::Option> the_options() const = 0;
+    /**
+     * The options not associated with a specific loaded module
+     */
+    virtual std::shared_ptr<options::Option> global_options() const = 0;
+    /**
+     * All options, including those added by the specified module
+     */
+    virtual auto the_options_for(SharedLibrary const& module) const -> std::shared_ptr<options::Option> = 0;
 
 protected:
+    OptionsProvider() = default;
+    virtual ~OptionsProvider() = default;
 
-    Configuration() = default;
-    virtual ~Configuration() = default;
-    Configuration(Configuration const&) = delete;
-    Configuration& operator=(Configuration const&) = delete;
+    OptionsProvider(OptionsProvider const&) = delete;
+    OptionsProvider& operator=(OptionsProvider const&) = delete;
 };
 }
 }
diff --git a/include/platform/mir/options/default_configuration.h b/include/platform/mir/options/default_configuration.h
index cb3c9d3ace5..6315d921c15 100644
--- a/include/platform/mir/options/default_configuration.h
+++ b/include/platform/mir/options/default_configuration.h
@@ -19,15 +19,15 @@
 
 #include "mir/options/configuration.h"
 #include "mir/options/program_option.h"
+#include "mir/shared_library.h"
 #include <boost/program_options/options_description.hpp>
 #include <vector>
 
 namespace mir
 {
-class SharedLibrary;
 namespace options
 {
-class DefaultConfiguration : public Configuration
+class DefaultConfiguration : public OptionsProvider
 {
 public:
     DefaultConfiguration(int argc, char const* argv[]);
@@ -54,7 +54,8 @@ class DefaultConfiguration : public Configuration
 
     void add_platform_options();
     // accessed via the base interface, when access to add_options() has been "lost"
-    std::shared_ptr<options::Option> the_options() const override;
+    std::shared_ptr<options::Option> global_options() const override;
+    auto the_options_for(SharedLibrary const& module) const -> std::shared_ptr<Option> override;
 
     virtual void parse_arguments(
         boost::program_options::options_description desc,
@@ -74,6 +75,47 @@ class DefaultConfiguration : public Configuration
     char const** const argv;
     std::function<void(int argc, char const* const* argv)> const unparsed_arguments_handler;
     std::shared_ptr<boost::program_options::options_description> const program_options;
+
+    template<typename Value>
+    class LibraryMap
+    {
+    private:
+        std::vector<std::pair<mir::SharedLibrary::Handle, Value>> values;
+
+        auto find(SharedLibrary const&) -> decltype(values)::iterator;
+        auto find(SharedLibrary const&) const -> decltype(values)::const_iterator;
+    public:
+        LibraryMap() = default;
+        ~LibraryMap() = default;
+
+        auto operator[](SharedLibrary const& lib) -> Value&;
+
+        auto at(SharedLibrary const& lib) const -> Value const&;
+
+        auto begin() const -> decltype(values)::const_iterator;
+        auto end() const -> decltype(values)::const_iterator;
+
+        template<typename ...Args>
+        auto emplace(SharedLibrary const& lib, Args&& ...args) -> std::pair<typename decltype(values)::iterator, bool>
+        {
+            auto existing = find(lib);
+
+            if (existing != values.end())
+            {
+                return {existing, false};
+            }
+
+            values.emplace_back(
+                std::piecewise_construct,
+                std::forward_as_tuple(lib.get_handle()),
+                std::forward<Args>(args)...);
+
+            return {values.end() - 1, true};
+        }
+    };
+
+    LibraryMap<boost::program_options::options_description> module_options_desc;
+    LibraryMap<std::shared_ptr<Option>> mutable module_options;
     std::shared_ptr<Option> mutable options;
 };
 }
diff --git a/include/platform/mir/options/program_option.h b/include/platform/mir/options/program_option.h
index dbfe05d0450..37f7571ba90 100644
--- a/include/platform/mir/options/program_option.h
+++ b/include/platform/mir/options/program_option.h
@@ -39,7 +39,7 @@ class ProgramOption : public Option
 
     void parse_environment(
         boost::program_options::options_description const& description,
-        char const* prefix);
+        std::function<std::string(std::string)> env_var_name_mapper);
 
     void parse_file(
         boost::program_options::options_description const& description,
diff --git a/src/include/server/mir/default_server_configuration.h b/src/include/server/mir/default_server_configuration.h
index f1d05bb7d5b..e62866e3549 100644
--- a/src/include/server/mir/default_server_configuration.h
+++ b/src/include/server/mir/default_server_configuration.h
@@ -17,6 +17,7 @@
 #define MIR_DEFAULT_SERVER_CONFIGURATION_H_
 
 #include "mir/cached_ptr.h"
+#include "mir/options/option.h"
 #include "mir/server_configuration.h"
 #include "mir/shell/window_manager_builder.h"
 
@@ -137,7 +138,7 @@ class Logger;
 namespace options
 {
 class Option;
-class Configuration;
+class OptionsProvider;
 }
 
 namespace report
@@ -160,7 +161,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
 {
 public:
     DefaultServerConfiguration(int argc, char const* argv[]);
-    explicit DefaultServerConfiguration(std::shared_ptr<options::Configuration> const& configuration_options);
+    explicit DefaultServerConfiguration(std::shared_ptr<options::OptionsProvider> const& configuration_options);
 
     /** @name DisplayServer dependencies
      * dependencies of DisplayServer on the rest of the Mir
@@ -347,6 +348,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
 
 protected:
     std::shared_ptr<options::Option> the_options() const;
+    auto the_options_provider() const -> std::shared_ptr<options::OptionsProvider>;
     std::shared_ptr<input::DefaultInputDeviceHub>  the_default_input_device_hub();
     std::shared_ptr<graphics::DisplayConfigurationObserver> the_display_configuration_observer();
     std::shared_ptr<input::SeatObserver> the_seat_observer();
@@ -434,7 +436,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
     std::shared_ptr<DecorationStrategy> decoration_strategy;
 
 private:
-    std::shared_ptr<options::Configuration> const configuration_options;
+    std::shared_ptr<options::OptionsProvider> const configuration_options;
     std::shared_ptr<input::EventFilter> default_filter;
     CachedPtr<ObserverMultiplexer<graphics::DisplayConfigurationObserver>>
         display_configuration_observer_multiplexer;
diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
index b2412781c9d..4845a868a11 100644
--- a/src/platform/options/default_configuration.cpp
+++ b/src/platform/options/default_configuration.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "mir/options/program_option.h"
 #include "mir/shared_library.h"
 #include "mir/options/default_configuration.h"
 #include "mir/graphics/platform.h"
@@ -68,6 +69,62 @@ namespace
 bool const enable_input_default        = true;
 }
 
+template<typename Value>
+auto mo::DefaultConfiguration::LibraryMap<Value>::find(SharedLibrary const& lib) const -> decltype(values)::const_iterator
+{
+    return std::find_if(
+        values.begin(),
+        values.end(),
+        [&lib](auto const& candidate) { return candidate.first == lib.get_handle(); });
+}
+
+template<typename Value>
+auto mo::DefaultConfiguration::LibraryMap<Value>::find(SharedLibrary const& lib) -> decltype(values)::iterator
+{
+    return std::find_if(
+        values.begin(),
+        values.end(),
+        [&lib](auto const& candidate) { return candidate.first == lib.get_handle(); });
+}
+
+template<typename Value>
+auto mo::DefaultConfiguration::LibraryMap<Value>::operator[](SharedLibrary const& lib) -> Value&
+{
+    auto existing = find(lib);
+    if (existing != values.end())
+    {
+        return existing->second;
+    }
+
+    values.emplace_back(std::make_pair(lib.get_handle(), Value{}));
+    return values.back().second;
+}
+
+template<typename Value>
+auto mo::DefaultConfiguration::LibraryMap<Value>::at(SharedLibrary const& lib) const -> Value const&
+{
+    auto existing = find(lib);
+
+    if (existing == values.end())
+    {
+        BOOST_THROW_EXCEPTION((std::out_of_range{"SharedLibrary not in map"}));
+    }
+
+    return existing->second;
+}
+
+template<typename Value>
+auto mo::DefaultConfiguration::LibraryMap<Value>::begin() const -> decltype(values)::const_iterator
+{
+    return values.cbegin();
+}
+
+template<typename Value>
+auto mo::DefaultConfiguration::LibraryMap<Value>::end() const -> decltype(values)::const_iterator
+{
+    return values.cend();
+}
+
 mo::DefaultConfiguration::DefaultConfiguration(int argc, char const* argv[]) :
     DefaultConfiguration(argc, argv, std::string{})
 {
@@ -200,6 +257,17 @@ mo::DefaultConfiguration::DefaultConfiguration(
         add_platform_options();
 }
 
+namespace
+{
+auto option_header_for(mir::SharedLibrary const& module) -> std::string
+{
+    auto const describe_module = module.load_function<mir::graphics::DescribeModule>("describe_graphics_module", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+    auto const description = describe_module();
+
+    return std::format("Options for module {}", description->name);
+}
+}
+
 void mo::DefaultConfiguration::add_platform_options()
 {
     namespace po = boost::program_options;
@@ -226,15 +294,19 @@ void mo::DefaultConfiguration::add_platform_options()
 
         for (auto& platform : platform_libraries)
         {
-            /* Ideally we'd namespace these options with the platform,
-             * and display them in a group as $FOO-platform-specific.
-             */
             try
             {
                 auto add_platform_options = platform->load_function<mir::graphics::AddPlatformOptions>("add_graphics_platform_options", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
-                add_platform_options(*this->program_options);
+                auto [options, inserted] = module_options_desc.emplace(
+                    *platform,
+                    std::forward_as_tuple(option_header_for(*platform)));
+
+                // *Pretty* sure this is impossible, but let's be sure!
+                assert(inserted && "Attempted to add platform options twice for the same module");
+
+                add_platform_options(options->second);
             }
-            catch (std::runtime_error&)
+            catch (std::runtime_error& e)
             {
                 /* We've failed to add the options - probably because it's not a graphics platform,
                  * or because it's got the wrong version - unload it; it's unnecessary.
@@ -269,7 +341,7 @@ boost::program_options::options_description_easy_init mo::DefaultConfiguration::
     return program_options->add_options();
 }
 
-std::shared_ptr<mo::Option> mo::DefaultConfiguration::the_options() const
+std::shared_ptr<mo::Option> mo::DefaultConfiguration::global_options() const
 {
     if (!options)
     {
@@ -282,6 +354,31 @@ std::shared_ptr<mo::Option> mo::DefaultConfiguration::the_options() const
     return options;
 }
 
+auto mo::DefaultConfiguration::the_options_for(SharedLibrary const& module) const -> std::shared_ptr<Option>
+{
+    auto parsed_options = module_options[module];
+    if (!parsed_options)
+    {
+        auto options = std::make_shared<ProgramOption>();
+        auto& module_option_desc = module_options_desc.at(module);
+
+        /* We can't combine the parsed global options with a parse of the module-specific options,
+         * but we *can* combine the global options description with the module options description
+         * and (re)parse everything against that.
+         */
+        boost::program_options::options_description joint_desc;
+        joint_desc.add(*program_options).add(module_option_desc);
+
+        parse_arguments(joint_desc, *options, argc, argv);
+        parse_environment(joint_desc, *options);
+        parse_config_file(joint_desc, *options);
+
+        module_options[module] = options;
+        parsed_options = options;
+    }
+
+    return parsed_options;
+}
 
 void mo::DefaultConfiguration::parse_arguments(
     boost::program_options::options_description desc,
@@ -300,10 +397,25 @@ void mo::DefaultConfiguration::parse_arguments(
 
         options.parse_arguments(desc, argc, argv);
 
-        auto const unparsed_arguments = options.unparsed_command_line();
+        auto unparsed_arguments = options.unparsed_command_line();
         std::vector<char const*> tokens;
         for (auto const& token : unparsed_arguments)
             tokens.push_back(token.c_str());
+
+        // Maybe the unparsed tokens are for a module?
+        for (auto const& [_, module_option_desc] : module_options_desc)
+        {
+            mo::ProgramOption tmp_options;
+            tmp_options.parse_arguments(module_option_desc, tokens.size(), tokens.data());
+
+            tokens.clear();
+            unparsed_arguments = tmp_options.unparsed_command_line();
+            for (auto const& token : unparsed_arguments)
+            {
+                tokens.push_back(token.c_str());
+            }
+        }
+
         if (!tokens.empty()) unparsed_arguments_handler(tokens.size(), tokens.data());
 
         // See the ExitWithOutput documentation for information about its usage.
@@ -311,6 +423,14 @@ void mo::DefaultConfiguration::parse_arguments(
         {
             std::ostringstream help_text;
             help_text << desc;
+            for (auto& [_, module_desc] : module_options_desc)
+            {
+                // We don't want to print out headers for platforms that don't have any options
+                if (!module_desc.options().empty())
+                {
+                    help_text << module_desc;
+                }
+            }
             BOOST_THROW_EXCEPTION(mir::ExitWithOutput(help_text.str()));
         }
 
@@ -329,11 +449,70 @@ void mo::DefaultConfiguration::parse_arguments(
     }
 }
 
+namespace
+{
+auto is_an_option(boost::program_options::options_description const& options, std::string const& name) -> bool
+{
+    return std::find_if(
+        options.options().cbegin(),
+        options.options().cend(),
+        [&name](auto const& option) -> bool
+        {
+            return option->long_name() == name;
+        }) != options.options().cend();
+}
+}
+
 void mo::DefaultConfiguration::parse_environment(
     boost::program_options::options_description& desc,
     mo::ProgramOption& options) const
 {
-    options.parse_environment(desc, "MIR_SERVER_");
+    options.parse_environment(
+        desc,
+        [=, this](std::string const& from) -> std::string
+        {
+            auto const prefix = "MIR_SERVER_";
+            auto const sizeof_prefix = strlen(prefix);
+
+            if (!from.starts_with(prefix))
+            {
+                return std::string{};
+            }
+
+            std::string result(from, sizeof_prefix);
+
+            for(auto& ch : result)
+            {
+                if (ch == '_') ch = '-';
+                else ch = std::tolower(ch, std::locale::classic()); // avoid current locale
+            }
+
+            /* Now, we want to not fail on any options that are module-specific but
+             * not for *this* module (or for the global parse)
+             *
+             * So, we check:
+             * 1. Is the result an option in `desc` (ie: an option we're trying to parse)? Return it. Or,
+             * 2. Is the option in one of the module-specific option descriptors? Ignore it.
+             * 3. Otherwise, return it as normal, and cause a failure
+             */
+
+            if (is_an_option(desc, result))
+            {
+                return result;
+            }
+
+            // Is it an option for a different module?
+            for (auto const& [_, module_opt_desc] : module_options_desc)
+            {
+                if (is_an_option(module_opt_desc, result))
+                {
+                    // We want to ignore this for now, rather than raise an unknown option error
+                    return std::string{};
+                }
+            }
+
+            return result;
+        });
 }
 
 void mo::DefaultConfiguration::parse_config_file(
diff --git a/src/platform/options/program_option.cpp b/src/platform/options/program_option.cpp
index 1cf88974083..b91f1d91d0e 100644
--- a/src/platform/options/program_option.cpp
+++ b/src/platform/options/program_option.cpp
@@ -58,26 +58,9 @@ std::vector<std::string> mo::ProgramOption::unparsed_command_line() const
 
 void mo::ProgramOption::parse_environment(
     po::options_description const& desc,
-    char const* prefix)
+    std::function<std::string(std::string)> env_var_mapper)
 {
-    auto parsed_options = po::parse_environment(
-        desc,
-        [=](std::string const& from) -> std::string
-        {
-             auto const sizeof_prefix = strlen(prefix);
-
-             if (from.length() < sizeof_prefix || 0 != from.find(prefix)) return std::string();
-
-             std::string result(from, sizeof_prefix);
-
-             for(auto& ch : result)
-             {
-                 if (ch == '_') ch = '-';
-                 else ch = std::tolower(ch, std::locale::classic()); // avoid current locale
-             }
-
-             return result;
-        });
+    auto parsed_options = po::parse_environment(desc, env_var_mapper);
 
     po::store(parsed_options, options);
 }
diff --git a/src/server/default_server_configuration.cpp b/src/server/default_server_configuration.cpp
index 6f6ce12ed03..80c5faff6d7 100644
--- a/src/server/default_server_configuration.cpp
+++ b/src/server/default_server_configuration.cpp
@@ -23,6 +23,7 @@
 #include "mir/frontend/wayland.h"
 
 #include "mir/logging/dumb_console_logger.h"
+#include "mir/options/option.h"
 #include "mir/options/program_option.h"
 #include "mir/frontend/session_credentials.h"
 #include "mir/frontend/session_authorizer.h"
@@ -55,7 +56,7 @@ mir::DefaultServerConfiguration::DefaultServerConfiguration(int argc, char const
 {
 }
 
-mir::DefaultServerConfiguration::DefaultServerConfiguration(std::shared_ptr<mo::Configuration> const& configuration_options) :
+mir::DefaultServerConfiguration::DefaultServerConfiguration(std::shared_ptr<mo::OptionsProvider> const& configuration_options) :
     configuration_options(configuration_options),
     enabled_wayland_extensions(frontend::get_standard_extensions())
 {
@@ -64,7 +65,13 @@ mir::DefaultServerConfiguration::DefaultServerConfiguration(std::shared_ptr<mo::
 auto mir::DefaultServerConfiguration::the_options() const
 ->std::shared_ptr<options::Option>
 {
-    return configuration_options->the_options();
+    return configuration_options->global_options();
+}
+
+auto mir::DefaultServerConfiguration::the_options_provider() const
+    -> std::shared_ptr<mo::OptionsProvider>
+{
+    return configuration_options;
 }
 
 std::shared_ptr<ms::SessionListener>
diff --git a/src/server/graphics/default_configuration.cpp b/src/server/graphics/default_configuration.cpp
index 5db02e1d707..9a1da5a296c 100644
--- a/src/server/graphics/default_configuration.cpp
+++ b/src/server/graphics/default_configuration.cpp
@@ -140,7 +140,7 @@ auto mir::DefaultServerConfiguration::the_display_platforms() -> std::vector<std
 
         try
         {
-            auto const platform_modules = mg::select_display_modules(*the_options(), the_console_services(), *the_shared_library_prober_report());
+            auto const platform_modules = mg::select_display_modules(*the_options_provider(), the_console_services(), *the_shared_library_prober_report());
 
             for (auto const& [device, platform]: platform_modules)
             {
@@ -178,7 +178,7 @@ auto mir::DefaultServerConfiguration::the_display_platforms() -> std::vector<std
                 display_platforms.push_back(
                     create_display_platform(
                         device,
-                        the_options(),
+                        the_options_provider()->the_options_for(*platform),
                         the_emergency_cleanup(),
                         the_console_services(),
                         the_display_report()));
@@ -261,7 +261,7 @@ auto mir::DefaultServerConfiguration::the_rendering_platforms() ->
             }
             else
             {
-                platform_modules = mir::graphics::rendering_modules_for_device(platforms, display_targets, *the_options(), the_console_services());
+                platform_modules = mir::graphics::rendering_modules_for_device(platforms, display_targets, *the_options_provider(), the_console_services());
             }
 
             for (auto const& [device, platform]: platform_modules)
@@ -296,13 +296,15 @@ auto mir::DefaultServerConfiguration::the_rendering_platforms() ->
                         device.device->devnode());
                 }
 
+                mir::log_info("Hello? Do we see this for %s", description->name);
+
                 // TODO: Do we want to be able to continue on partial failure here?
                 rendering_platform_map.emplace(
                     description->name,
                     create_rendering_platform(
                         device,
                         display_targets,
-                        *the_options(),
+                        *the_options_provider()->the_options_for(*platform),
                         *the_emergency_cleanup()));
                 // Add this module to the list searched by the input stack later
                 // TODO: Come up with a more principled solution for combined input/rendering/output platforms
diff --git a/src/server/graphics/platform_probe.cpp b/src/server/graphics/platform_probe.cpp
index 430972670d4..db707a7cf52 100644
--- a/src/server/graphics/platform_probe.cpp
+++ b/src/server/graphics/platform_probe.cpp
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "mir/graphics/default_display_configuration_policy.h"
 #include "mir/graphics/display.h"
 #include "mir/log.h"
 #include "mir/graphics/platform.h"
@@ -80,11 +81,24 @@ auto probe_module(
     }
     return supported_devices;
 }
+
+auto is_graphics_module(mir::SharedLibrary const& module) -> bool
+{
+    try
+    {
+        module.load_function<mg::DescribeModule>("describe_graphics_module", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
+        return true;
+    }
+    catch (std::exception const&)
+    {
+        return false;
+    }
+}
 }
 
 auto mir::graphics::probe_display_module(
     SharedLibrary const& module,
-    options::Option const& options,
+    mo::Option const& options,
     std::shared_ptr<ConsoleServices> const& console) -> std::vector<SupportedDevice>
 {
     return probe_module(
@@ -102,7 +116,7 @@ auto mir::graphics::probe_display_module(
 auto mir::graphics::probe_rendering_module(
     std::span<std::shared_ptr<mg::DisplayPlatform>> const& platforms,
     SharedLibrary const& module,
-    options::Option const& options,
+    mo::Option const& options,
     std::shared_ptr<ConsoleServices> const& console) -> std::vector<SupportedDevice>
 {
     return probe_module(
@@ -269,13 +283,13 @@ auto mg::modules_for_device(
 
 auto mir::graphics::display_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
-    options::Option const& options,
+    mo::OptionsProvider const& options,
     std::shared_ptr<ConsoleServices> const& console) -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>
 {
     return modules_for_device(
         [&options, &console](mir::SharedLibrary const& module) -> std::vector<mg::SupportedDevice>
         {
-            return mg::probe_display_module(module, options, console);
+            return mg::probe_display_module(module, *options.the_options_for(module), console);
         },
         modules,
         TypePreference::prefer_nested);
@@ -284,13 +298,20 @@ auto mir::graphics::display_modules_for_device(
 auto mir::graphics::rendering_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
     std::span<std::shared_ptr<DisplayPlatform>> const& platforms,
-    options::Option const& options,
+    mo::OptionsProvider const& options,
     std::shared_ptr<ConsoleServices> const& console) -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>
 {
     return modules_for_device(
         [&platforms, &options, &console](SharedLibrary const& module) -> std::vector<SupportedDevice>
         {
-            return probe_rendering_module(platforms, module, options, console);
+            if (is_graphics_module(module))
+            {
+                return probe_rendering_module(platforms, module, *options.the_options_for(module), console);
+            }
+            else
+            {
+                return {};
+            }
         },
         modules,
         TypePreference::prefer_hardware);
@@ -372,14 +393,15 @@ auto dso_filename_alphabetically_before(mir::SharedLibrary const& a, mir::Shared
 }
 
 auto mg::select_display_modules(
-    options::Option const& options,
+    options::OptionsProvider const& options,
     std::shared_ptr<ConsoleServices> const& console,
     SharedLibraryProberReport& lib_loader_report)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>
 {
     std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>> platform_modules;
 
-    auto const& path = options.get<std::string>(options::platform_path);
+    auto const global_options = options.global_options();
+    auto const& path = global_options->get<std::string>(options::platform_path);
     auto platforms = mir::libraries_for_path(path, lib_loader_report);
 
     if (platforms.empty())
@@ -398,17 +420,7 @@ auto mg::select_display_modules(
             platforms.end(),
             [](auto const& module)
             {
-                try
-                {
-                    module->template load_function<mir::graphics::DescribeModule>(
-                        "describe_graphics_module",
-                        MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
-                    return false;
-                }
-                catch (std::runtime_error const&)
-                {
-                    return true;
-                }
+                return !is_graphics_module(*module);
             }),
         platforms.end());
 
@@ -457,17 +469,17 @@ auto mg::select_display_modules(
         });
     auto virtual_platform = virtual_platform_pos != platforms.end() ? *virtual_platform_pos : std::shared_ptr<SharedLibrary>{};
 
-    if (options.is_set(options::platform_display_libs))
+    if (global_options->is_set(options::platform_display_libs))
     {
         auto const manually_selected_platforms =
-            select_platforms_from_list(options.get<std::string>(options::platform_display_libs), platforms);
+            select_platforms_from_list(global_options->get<std::string>(options::platform_display_libs), platforms);
 
         for (auto const& platform : manually_selected_platforms)
         {
             auto supported_devices =
                 graphics::probe_display_module(
                     *platform,
-                    options,
+                    *options.the_options_for(*platform),
                     console);
 
             bool found_supported_device{false};
@@ -519,7 +531,7 @@ auto mg::select_display_modules(
     if (virtual_platform)
     {
         auto virtual_probe = probe_display_module(
-            *virtual_platform, options, console);
+            *virtual_platform, *options.the_options_for(*virtual_platform), console);
         if (virtual_probe.size() && virtual_probe.front().support_level >= mg::probe::supported)
         {
             platform_modules.emplace_back(std::move(virtual_probe.front()), std::move(virtual_platform));
diff --git a/src/server/graphics/platform_probe.h b/src/server/graphics/platform_probe.h
index 55276048449..ffb0cd91036 100644
--- a/src/server/graphics/platform_probe.h
+++ b/src/server/graphics/platform_probe.h
@@ -20,7 +20,6 @@
 #include <vector>
 #include <memory>
 #include "mir/shared_library.h"
-#include "mir/options/program_option.h"
 #include "mir/graphics/platform.h"
 #include "mir/shared_library_prober_report.h"
 
@@ -28,6 +27,11 @@ namespace mir
 {
 class ConsoleServices;
 
+namespace options
+{
+class OptionsProvider;
+}
+
 namespace graphics
 {
 class RenderingPlatform;
@@ -57,19 +61,19 @@ auto probe_rendering_module(
 
 auto display_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
-    options::Option const& options,
+    options::OptionsProvider const& options,
     std::shared_ptr<ConsoleServices> const& console)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>;
 
 auto rendering_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
     std::span<std::shared_ptr<DisplayPlatform>> const& platforms,
-    options::Option const& options,
+    options::OptionsProvider const& options,
     std::shared_ptr<ConsoleServices> const& console)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>;
 
 auto select_display_modules(
-    options::Option const& options,
+    options::OptionsProvider const& options,
     std::shared_ptr<ConsoleServices> const& console,
     SharedLibraryProberReport& lib_loader_report)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>;
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 3126ca86b9b..8d31a61bb5f 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -208,7 +208,7 @@ auto wrap_##name(decltype(Self::name##_wrapper)::result_type const& wrapped)\
 struct mir::Server::ServerConfiguration : mir::DefaultServerConfiguration
 {
     ServerConfiguration(
-        std::shared_ptr<options::Configuration> const& configuration_options,
+        std::shared_ptr<options::OptionsProvider> const& configuration_options,
         std::shared_ptr<Self> const& self) :
         DefaultServerConfiguration(configuration_options),
         self(self.get())
diff --git a/tests/acceptance-tests/server_configuration_options.cpp b/tests/acceptance-tests/server_configuration_options.cpp
index dfa01a8f713..4d52789939d 100644
--- a/tests/acceptance-tests/server_configuration_options.cpp
+++ b/tests/acceptance-tests/server_configuration_options.cpp
@@ -18,6 +18,7 @@
 
 #include "mir/options/option.h"
 
+#include <boost/program_options/errors.hpp>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
@@ -132,6 +133,39 @@ TEST_F(ServerConfigurationOptions, unknown_command_line_options_are_passed_to_ha
     server.apply_settings();
 }
 
+TEST_F(ServerConfigurationOptions, are_parsed_from_environment)
+{
+    auto const option_name = "test-option";
+    auto const option_env_key = "MIR_SERVER_TEST_OPTION";
+    auto const option_env_value = "a string";
+
+    add_to_environment(option_env_key, option_env_value);
+
+    server.add_configuration_option(option_name, "", mir::OptionType::string);
+
+    server.apply_settings();
+
+    auto const options = server.get_options();
+    EXPECT_THAT(options->get<std::string>(option_name), StrEq(option_env_value));
+}
+
+TEST_F(ServerConfigurationOptions, unknown_environment_options_are_fatal)
+{
+    auto const option_env_key = "MIR_SERVER_NOT_ACTUALLY_AN_OPTION_DEFINED";
+    auto const option_env_value = "a string";
+
+    add_to_environment(option_env_key, option_env_value);
+
+    EXPECT_THROW(
+        {
+            server.apply_settings();
+
+            server.get_options();
+        },
+        boost::program_options::unknown_option
+    );
+}
+
 TEST_F(ServerConfigurationOptions, are_read_from_xdg_config_home)
 {
     create_config_file_in(fake_xdg_config_home);
diff --git a/tests/mir_test_framework/command_line_server_configuration.cpp b/tests/mir_test_framework/command_line_server_configuration.cpp
index 6650ebf5114..1c1e79d6010 100644
--- a/tests/mir_test_framework/command_line_server_configuration.cpp
+++ b/tests/mir_test_framework/command_line_server_configuration.cpp
@@ -23,7 +23,6 @@
 
 #include <gtest/gtest.h>
 
-#include <algorithm>
 #include <cstring>
 
 namespace mo=mir::options;
diff --git a/tests/unit-tests/graphics/test_platform_prober.cpp b/tests/unit-tests/graphics/test_platform_prober.cpp
index af833f2801f..e607abfa613 100644
--- a/tests/unit-tests/graphics/test_platform_prober.cpp
+++ b/tests/unit-tests/graphics/test_platform_prober.cpp
@@ -27,6 +27,7 @@
 #include "mir/graphics/platform.h"
 #include "mir/options/configuration.h"
 #include "mir/options/default_configuration.h"
+#include "mir/options/option.h"
 #include "mir/shared_library.h"
 #include "mir/shared_library_prober_report.h"
 #include "mir/test/doubles/fake_display.h"
@@ -181,12 +182,29 @@ class ServerPlatformProbeMockDRM : public ::testing::Test
 #endif
 };
 
+class StubOptionsProvider : public mo::OptionsProvider
+{
+public:
+    StubOptionsProvider() = default;
+    ~StubOptionsProvider() override = default;
+
+    auto global_options() const -> std::shared_ptr<mo::Option> override
+    {
+        return std::make_shared<mo::ProgramOption>();
+    }
+
+    auto the_options_for(mir::SharedLibrary const& /*module*/) const -> std::shared_ptr<mo::Option> override
+    {
+        return std::make_shared<mo::ProgramOption>();
+    }
+};
+
 }
 
 TEST(ServerPlatformProbe, ConstructingWithNoModulesIsAnError)
 {
     std::vector<std::shared_ptr<mir::SharedLibrary>> empty_modules;
-    mir::options::ProgramOption options;
+    StubOptionsProvider options;
 
     EXPECT_THROW(mir::graphics::display_modules_for_device(empty_modules, options, nullptr),
                  std::runtime_error);
@@ -196,7 +214,7 @@ TEST(ServerPlatformProbe, ConstructingWithNoModulesIsAnError)
 TEST_F(ServerPlatformProbeMockDRM, LoadsMesaPlatformWhenDrmMasterCanBeAcquired)
 {
     using namespace testing;
-    mir::options::ProgramOption options;
+    StubOptionsProvider options;
     auto fake_mesa = ensure_mesa_probing_succeeds();
 
     auto modules = available_platforms();
@@ -220,7 +238,7 @@ TEST_F(ServerPlatformProbeMockDRM, LoadsMesaPlatformWhenDrmMasterCanBeAcquired)
 TEST_F(ServerPlatformProbeMockDRM, DoesNotLoadDummyPlatformWhenBetterPlatformExists)
 {
     using namespace testing;
-    mir::options::ProgramOption options;
+    StubOptionsProvider options;
     auto fake_mesa = ensure_mesa_probing_succeeds();
 
     auto modules = available_platforms();
@@ -243,7 +261,7 @@ TEST_F(ServerPlatformProbeMockDRM, DoesNotLoadDummyPlatformWhenBetterPlatformExi
 TEST(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully)
 {
     using namespace testing;
-    mir::options::ProgramOption options;
+    StubOptionsProvider options;
     auto block_mesa = ensure_mesa_probing_fails();
 
     auto modules = available_platforms();
@@ -260,7 +278,7 @@ TEST(ServerPlatformProbe, ThrowsExceptionWhenNothingProbesSuccessfully)
 TEST(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule)
 {
     using namespace testing;
-    mir::options::ProgramOption options;
+    StubOptionsProvider options;
     auto block_mesa = ensure_mesa_probing_fails();
 
     auto modules = available_platforms();
@@ -285,7 +303,7 @@ TEST(ServerPlatformProbe, LoadsSupportedModuleWhenNoBestModule)
 TEST(ServerPlatformProbe, IgnoresNonPlatformModules)
 {
     using namespace testing;
-    mir::options::ProgramOption options;
+    StubOptionsProvider options;
 
     std::vector<std::shared_ptr<mir::SharedLibrary>> modules;
     add_dummy_platform(modules);
@@ -632,7 +650,16 @@ class FullProbeStack : public testing::Test
             ((mtd::logging_opt), boost::program_options::value<std::string>()->default_value(""), mtd::logging_descr);
 
         options = std::move(opts);
-        return *(options->the_options());
+        return *(options->global_options());
+    }
+
+    auto the_options_provider() -> mo::OptionsProvider const&
+    {
+        if (!options)
+        {
+            the_options();
+        }
+        return *options;
     }
 
     auto the_console_services() -> std::shared_ptr<mir::ConsoleServices>
@@ -656,7 +683,7 @@ class FullProbeStack : public testing::Test
      * would call mo::Configuration::~Configiration and fail, whereas std::make_shared<mo::DefaultConfiguration> will capture
      * mo::DefaultConfiguration::~DefaultConfiguration and compile.
      */
-    std::shared_ptr<mo::Configuration> options;
+    std::shared_ptr<mo::OptionsProvider> options;
     std::shared_ptr<mir::SharedLibraryProberReport> const report;
 
     std::vector<std::unique_ptr<mtf::TemporaryEnvironmentValue>> temporary_env;
@@ -689,7 +716,7 @@ TEST_F(FullProbeStack, select_display_modules_loads_all_available_hardware_when_
         }
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
     EXPECT_THAT(devices.size(), Eq(expected_hardware_count));
 }
 
@@ -747,7 +774,7 @@ TEST_F(FullProbeStack, select_display_modules_loads_virtual_platform_as_well_as_
 
     add_virtual_option();
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     // We expect the Virtual platform to load
     EXPECT_THAT(devices, Contains(Pair(_, ModuleNameMatches(StrEq("mir:virtual")))));
@@ -773,7 +800,7 @@ TEST_F(FullProbeStack, select_display_loads_gbm_platform_for_each_kms_device)
         GTEST_SKIP() << "gbm-kms platform not built";
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     for(auto const& device: udev_devices)
     {
@@ -796,7 +823,7 @@ TEST_F(FullProbeStack, select_display_modules_loads_x11_platform_even_when_gbm_i
         GTEST_SKIP() << "gbm-kms platform not built; cannot test hardware platform probing";
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     // We expect the X11 platform to load
     EXPECT_THAT(devices, Contains(Pair(_, ModuleNameMatches(StrEq("mir:x11")))));
@@ -818,7 +845,7 @@ TEST_F(FullProbeStack, when_all_of_gbm_and_x11_and_virtual_are_available_select_
         GTEST_SKIP() << "gbm-kms platform not built; cannot test hardware platform probing";
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     // We expect the X11 platform to load
     EXPECT_THAT(devices, Contains(Pair(_, ModuleNameMatches(StrEq("mir:x11")))));
@@ -841,7 +868,7 @@ TEST_F(FullProbeStack, select_display_modules_loads_wayland_platform_even_when_g
         GTEST_SKIP() << "gbm-kms platform not built; cannot test hardware platform probing";
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     // We expect the Wayland platform to load
     EXPECT_THAT(devices, Contains(Pair(_, ModuleNameMatches(StrEq("mir:wayland")))));
@@ -863,7 +890,7 @@ TEST_F(FullProbeStack, when_all_of_gbm_and_wayland_and_virtual_are_available_sel
         GTEST_SKIP() << "gbm-kms platform not built; cannot test hardware platform probing";
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     // We expect the Wayland platform to load
     EXPECT_THAT(devices, Contains(Pair(_, ModuleNameMatches(StrEq("mir:wayland")))));
@@ -878,7 +905,7 @@ TEST_F(FullProbeStack, when_both_wayland_and_x11_are_supported_x11_is_chosen)
     enable_host_wayland();
     enable_host_x11();
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     EXPECT_THAT(devices, Not(Contains(Pair(_, ModuleNameMatches(StrEq("mir:wayland"))))));
     EXPECT_THAT(devices, Contains(Pair(_, ModuleNameMatches(StrEq("mir:x11")))));
@@ -907,7 +934,7 @@ TEST_F(FullProbeStack, instantiates_all_manually_selected_platforms)
         set_display_libs_option("mir:x11,mir:wayland");
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     if (expect_kms_device)
     {
@@ -952,7 +979,7 @@ TEST_F(FullProbeStack, instantiates_all_manually_selected_platforms_and_virtual_
         set_display_libs_option("mir:x11,mir:wayland");
     }
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     if (expect_kms_device)
     {
@@ -996,7 +1023,7 @@ TEST_F(FullProbeStack, selects_only_gbm_when_manually_specified_even_if_x11_and_
 
     set_display_libs_option("mir:gbm-kms");
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     EXPECT_THAT(
         devices,
@@ -1015,7 +1042,7 @@ TEST_F(FullProbeStack, doesnt_instantiate_other_platforms_when_manually_selected
 
     set_display_libs_option("mir:gbm-kms");
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     EXPECT_THAT(devices, IsEmpty());
 }
@@ -1029,7 +1056,7 @@ TEST_F(FullProbeStack, manually_selecting_only_virtual_platform_with_no_virtual_
 
     set_display_libs_option("mir:virtual");
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     EXPECT_THAT(devices, IsEmpty());
 }
@@ -1044,7 +1071,7 @@ TEST_F(FullProbeStack, manually_selecting_only_virtual_platform_with_required_op
 
     set_display_libs_option("mir:virtual");
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     ASSERT_THAT(devices.size(), Eq(1));
     EXPECT_THAT(devices.front(), Pair(_, ModuleNameMatches(StrEq("mir:virtual"))));
@@ -1067,7 +1094,7 @@ TEST_F(FullProbeStack, gbm_kms_is_not_selected_for_nvidia_driver_by_default)
     enable_gbm_on_kms_device(*nouveau_device);
     enable_gbm_on_kms_device(*amd_device);
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     EXPECT_THAT(devices, UnorderedElementsAre(
         Pair(IsPlatformForDevice(nouveau_device.get()), ModuleNameMatches(StrEq("mir:gbm-kms"))),
@@ -1094,7 +1121,7 @@ TEST_F(FullProbeStack, gbm_kms_is_selected_for_nvidia_driver_when_quirk_is_allow
 
     mtf::TemporaryEnvironmentValue skip_nvidia_quirk{"MIR_SERVER_DRIVER_QUIRKS", "allow:driver:nvidia"};
 
-    auto devices = mg::select_display_modules(the_options(), the_console_services(), *the_library_prober_report());
+    auto devices = mg::select_display_modules(the_options_provider(), the_console_services(), *the_library_prober_report());
 
     EXPECT_THAT(devices, UnorderedElementsAre(
         Pair(IsPlatformForDevice(nvidia_device.get()), ModuleNameMatches(StrEq("mir:gbm-kms"))),
diff --git a/tests/unit-tests/options/test_program_option.cpp b/tests/unit-tests/options/test_program_option.cpp
index c2c14b2ad0b..a0ddfa66c8d 100644
--- a/tests/unit-tests/options/test_program_option.cpp
+++ b/tests/unit-tests/options/test_program_option.cpp
@@ -209,28 +209,6 @@ TEST_F(ProgramOption, unparsed_command_line_returns_unprocessed_tokens)
     EXPECT_THAT(po.unparsed_command_line(), ElementsAre("--hello", "world", "--answer", "42"));
 }
 
-TEST(ProgramOptionEnv, parse_environment)
-{
-    // Env variables should be uppercase and "_" delimited
-    char const* name = "some-key";
-    char const* key = "SOME_KEY";
-    char const* value = "test_value";
-    auto const env = std::string(__PRETTY_FUNCTION__) + key;
-    setenv(env.c_str(), value, true);
-
-    bpo::options_description desc;
-    desc.add_options()
-        (name, bpo::value<std::string>());
-
-    mir::options::ProgramOption po;
-    po.parse_environment(desc, __PRETTY_FUNCTION__);
-
-    EXPECT_EQ(value, po.get(name, "default"));
-    EXPECT_EQ("default", po.get("garbage", "default"));
-    EXPECT_TRUE(po.is_set(name));
-    EXPECT_FALSE(po.is_set("garbage"));
-}
-
 // TODO need to parse something
 TEST(ProgramOptionFile, parse_files)
 {

From bed2be102b283ecb7d3370ee6c4a2e8c492fa18b Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon, 9 Sep 2024 17:42:35 +1000
Subject: [PATCH 03/18] mo::DefaultConfiguration: Add missing `#include
 <format>`

Apparently this isn't necessary on 24.10? The code definitely uses it, though.
---
 src/platform/options/default_configuration.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
index 4845a868a11..2f358d2c542 100644
--- a/src/platform/options/default_configuration.cpp
+++ b/src/platform/options/default_configuration.cpp
@@ -22,6 +22,8 @@
 #include "mir/shared_library_prober.h"
 #include "mir/logging/null_shared_library_prober_report.h"
 
+#include <format>
+
 namespace mo = mir::options;
 
 char const* const mo::arw_server_socket_opt       = "arw-file";

From 277ca7dc28d9e80a6940ebb550a873a368d560de Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue, 10 Sep 2024 11:53:28 +1000
Subject: [PATCH 04/18] mo::DefaultConfiguration: Don't accidentally consume an
 unparsed option per module.

`mo::ProgramOption::parse_arguments()` assumes that the *first* argument in the arguments array is
`argv[0]`; that is, the name of the calling binary, and so it strips it out. This was causing us
to consume an unparsed argument for each module we had loaded.

Instead, insert `argv[0]` into the argument array before parsing.
---
 src/platform/options/default_configuration.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
index 2f358d2c542..b0ca82124ca 100644
--- a/src/platform/options/default_configuration.cpp
+++ b/src/platform/options/default_configuration.cpp
@@ -404,9 +404,14 @@ void mo::DefaultConfiguration::parse_arguments(
         for (auto const& token : unparsed_arguments)
             tokens.push_back(token.c_str());
 
+        auto const argv0 = argc > 0 ? argv[0] : "fake argv[0]";
         // Maybe the unparsed tokens are for a module?
         for (auto const& [_, module_option_desc] : module_options_desc)
         {
+            /* We assume that argv[0] is *not* an option; instead, it's the name of the binary
+             * So when reparsing, we need to add a fake argv[0]
+             */
+            tokens.insert(tokens.begin(), argv0);
             mo::ProgramOption tmp_options;
             tmp_options.parse_arguments(module_option_desc, tokens.size(), tokens.data());
 

From 19a0bdd3ff04f82a6dec381fcd1574e8bd6401ee Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue, 10 Sep 2024 12:33:34 +1000
Subject: [PATCH 05/18] mo::DefaultConfiguration: Micro-optimisation

If there aren't any unparsed tokens left then we don't need to see if
any remaining modules might consume them.
---
 src/platform/options/default_configuration.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
index b0ca82124ca..5c807c79fba 100644
--- a/src/platform/options/default_configuration.cpp
+++ b/src/platform/options/default_configuration.cpp
@@ -408,6 +408,12 @@ void mo::DefaultConfiguration::parse_arguments(
         // Maybe the unparsed tokens are for a module?
         for (auto const& [_, module_option_desc] : module_options_desc)
         {
+            if (tokens.empty())
+            {
+                // There aren't any unparsed arguments, so we're done here
+                break;
+            }
+
             /* We assume that argv[0] is *not* an option; instead, it's the name of the binary
              * So when reparsing, we need to add a fake argv[0]
              */

From 3449d22d1c02914fe36ca53cc4ee81dbe4c971af Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue, 10 Sep 2024 13:04:18 +1000
Subject: [PATCH 06/18] mg::DefaultConfiguration: Clean up stray debug logging

---
 src/server/graphics/default_configuration.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/server/graphics/default_configuration.cpp b/src/server/graphics/default_configuration.cpp
index 9a1da5a296c..73c295f42e3 100644
--- a/src/server/graphics/default_configuration.cpp
+++ b/src/server/graphics/default_configuration.cpp
@@ -151,7 +151,7 @@ auto mir::DefaultServerConfiguration::the_display_platforms() -> std::vector<std
                 auto describe_module = platform->load_function<mg::DescribeModule>(
                     "describe_graphics_module",
                     MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
-                
+
                 auto description = describe_module();
                 if (!device.device)
                 {
@@ -296,8 +296,6 @@ auto mir::DefaultServerConfiguration::the_rendering_platforms() ->
                         device.device->devnode());
                 }
 
-                mir::log_info("Hello? Do we see this for %s", description->name);
-
                 // TODO: Do we want to be able to continue on partial failure here?
                 rendering_platform_map.emplace(
                     description->name,

From 02970b4a982be4ade89e1e1e3926c1c42814f43f Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue, 10 Sep 2024 13:34:20 +1000
Subject: [PATCH 07/18] mo::DefaultConfiguration: Drop bespoke `LibraryMap` in
 favour of `unordered_map`

This existed for hysterical raisins, but those got evenually whittled
down over the course of development, and now `std::unordered_map` does
what we want.
---
 include/common/mir/shared_library.h           |  9 ++-
 .../mir/options/default_configuration.h       | 43 +-----------
 src/common/sharedlibrary/shared_library.cpp   |  7 ++
 src/common/symbols.map                        |  1 +
 .../options/default_configuration.cpp         | 66 ++-----------------
 5 files changed, 24 insertions(+), 102 deletions(-)

diff --git a/include/common/mir/shared_library.h b/include/common/mir/shared_library.h
index dd783d669da..5972635e2b2 100644
--- a/include/common/mir/shared_library.h
+++ b/include/common/mir/shared_library.h
@@ -53,12 +53,13 @@ class SharedLibrary
 
     class Handle
     {
-    public:    
+    public:
         auto operator<=>(Handle const& rhs) const -> std::strong_ordering;
         auto operator==(Handle const& rhs) const -> bool = default;
         auto operator!=(Handle const& rhs) const -> bool = default;
     private:
         friend class SharedLibrary;
+        friend struct std::hash<Handle>;
 
         Handle(void* handle);
         void* handle;
@@ -74,4 +75,10 @@ class SharedLibrary
 };
 }
 
+template<>
+struct std::hash<mir::SharedLibrary::Handle>
+{
+    auto operator()(mir::SharedLibrary::Handle const& h) const noexcept -> std::size_t;
+};
+
 #endif /* MIR_SHARED_LIBRARY_H_ */
diff --git a/include/platform/mir/options/default_configuration.h b/include/platform/mir/options/default_configuration.h
index 6315d921c15..cd7d2e62a68 100644
--- a/include/platform/mir/options/default_configuration.h
+++ b/include/platform/mir/options/default_configuration.h
@@ -22,6 +22,7 @@
 #include "mir/shared_library.h"
 #include <boost/program_options/options_description.hpp>
 #include <vector>
+#include <unordered_map>
 
 namespace mir
 {
@@ -76,46 +77,8 @@ class DefaultConfiguration : public OptionsProvider
     std::function<void(int argc, char const* const* argv)> const unparsed_arguments_handler;
     std::shared_ptr<boost::program_options::options_description> const program_options;
 
-    template<typename Value>
-    class LibraryMap
-    {
-    private:
-        std::vector<std::pair<mir::SharedLibrary::Handle, Value>> values;
-
-        auto find(SharedLibrary const&) -> decltype(values)::iterator;
-        auto find(SharedLibrary const&) const -> decltype(values)::const_iterator;
-    public:
-        LibraryMap() = default;
-        ~LibraryMap() = default;
-
-        auto operator[](SharedLibrary const& lib) -> Value&;
-
-        auto at(SharedLibrary const& lib) const -> Value const&;
-
-        auto begin() const -> decltype(values)::const_iterator;
-        auto end() const -> decltype(values)::const_iterator;
-
-        template<typename ...Args>
-        auto emplace(SharedLibrary const& lib, Args&& ...args) -> std::pair<typename decltype(values)::iterator, bool>
-        {
-            auto existing = find(lib);
-
-            if (existing != values.end())
-            {
-                return {existing, false};
-            }
-
-            values.emplace_back(
-                std::piecewise_construct,
-                std::forward_as_tuple(lib.get_handle()),
-                std::forward<Args>(args)...);
-
-            return {values.end() - 1, true};
-        }
-    };
-
-    LibraryMap<boost::program_options::options_description> module_options_desc;
-    LibraryMap<std::shared_ptr<Option>> mutable module_options;
+    std::unordered_map<SharedLibrary::Handle, boost::program_options::options_description> module_options_desc;
+    std::unordered_map<SharedLibrary::Handle, std::shared_ptr<Option>> mutable module_options;
     std::shared_ptr<Option> mutable options;
 };
 }
diff --git a/src/common/sharedlibrary/shared_library.cpp b/src/common/sharedlibrary/shared_library.cpp
index a76e9b010e4..bd0b399d23c 100644
--- a/src/common/sharedlibrary/shared_library.cpp
+++ b/src/common/sharedlibrary/shared_library.cpp
@@ -16,6 +16,7 @@
 
 #include "mir/shared_library.h"
 #include <compare>
+#include <cstddef>
 
 #ifdef MIR_DONT_USE_DLVSYM
 #include <mir/log.h>
@@ -90,3 +91,9 @@ auto mir::SharedLibrary::Handle::operator<=>(Handle const& rhs) const -> std::st
 {
     return handle <=> rhs.handle;
 }
+
+auto std::hash<mir::SharedLibrary::Handle>::operator()(mir::SharedLibrary::Handle const& handle) const noexcept
+    -> std::size_t
+{
+    return std::hash<void*>{}(handle.handle);
+}
diff --git a/src/common/symbols.map b/src/common/symbols.map
index eb0b74ed64d..c49859b90f9 100644
--- a/src/common/symbols.map
+++ b/src/common/symbols.map
@@ -328,6 +328,7 @@ global:
     mir::SharedLibrary::get_handle*;
     mir::SharedLibrary::Handle::?Handle*;
     mir::SharedLibrary::Handle::operator*;
+    std::hash?mir::SharedLibrary::Handle?::operator*;
     mir::SharedLibraryProberReport::?SharedLibraryProberReport*;
     mir::SharedLibraryProberReport::SharedLibraryProberReport*;
     mir::SharedLibraryProberReport::operator*;
diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
index 5c807c79fba..8a809249685 100644
--- a/src/platform/options/default_configuration.cpp
+++ b/src/platform/options/default_configuration.cpp
@@ -71,62 +71,6 @@ namespace
 bool const enable_input_default        = true;
 }
 
-template<typename Value>
-auto mo::DefaultConfiguration::LibraryMap<Value>::find(SharedLibrary const& lib) const -> decltype(values)::const_iterator
-{
-    return std::find_if(
-        values.begin(),
-        values.end(),
-        [&lib](auto const& candidate) { return candidate.first == lib.get_handle(); });
-}
-
-template<typename Value>
-auto mo::DefaultConfiguration::LibraryMap<Value>::find(SharedLibrary const& lib) -> decltype(values)::iterator
-{
-    return std::find_if(
-        values.begin(),
-        values.end(),
-        [&lib](auto const& candidate) { return candidate.first == lib.get_handle(); });
-}
-
-template<typename Value>
-auto mo::DefaultConfiguration::LibraryMap<Value>::operator[](SharedLibrary const& lib) -> Value&
-{
-    auto existing = find(lib);
-    if (existing != values.end())
-    {
-        return existing->second;
-    }
-
-    values.emplace_back(std::make_pair(lib.get_handle(), Value{}));
-    return values.back().second;
-}
-
-template<typename Value>
-auto mo::DefaultConfiguration::LibraryMap<Value>::at(SharedLibrary const& lib) const -> Value const&
-{
-    auto existing = find(lib);
-
-    if (existing == values.end())
-    {
-        BOOST_THROW_EXCEPTION((std::out_of_range{"SharedLibrary not in map"}));
-    }
-
-    return existing->second;
-}
-
-template<typename Value>
-auto mo::DefaultConfiguration::LibraryMap<Value>::begin() const -> decltype(values)::const_iterator
-{
-    return values.cbegin();
-}
-
-template<typename Value>
-auto mo::DefaultConfiguration::LibraryMap<Value>::end() const -> decltype(values)::const_iterator
-{
-    return values.cend();
-}
-
 mo::DefaultConfiguration::DefaultConfiguration(int argc, char const* argv[]) :
     DefaultConfiguration(argc, argv, std::string{})
 {
@@ -300,8 +244,8 @@ void mo::DefaultConfiguration::add_platform_options()
             {
                 auto add_platform_options = platform->load_function<mir::graphics::AddPlatformOptions>("add_graphics_platform_options", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
                 auto [options, inserted] = module_options_desc.emplace(
-                    *platform,
-                    std::forward_as_tuple(option_header_for(*platform)));
+                    platform->get_handle(),
+                    option_header_for(*platform));
 
                 // *Pretty* sure this is impossible, but let's be sure!
                 assert(inserted && "Attempted to add platform options twice for the same module");
@@ -358,11 +302,11 @@ std::shared_ptr<mo::Option> mo::DefaultConfiguration::global_options() const
 
 auto mo::DefaultConfiguration::the_options_for(SharedLibrary const& module) const -> std::shared_ptr<Option>
 {
-    auto parsed_options = module_options[module];
+    auto parsed_options = module_options[module.get_handle()];
     if (!parsed_options)
     {
         auto options = std::make_shared<ProgramOption>();
-        auto& module_option_desc = module_options_desc.at(module);
+        auto& module_option_desc = module_options_desc.at(module.get_handle());
 
         /* We can't combine the parsed global options with a parse of the module-specific options,
          * but we *can* combine the global options description with the module options description
@@ -375,7 +319,7 @@ auto mo::DefaultConfiguration::the_options_for(SharedLibrary const& module) cons
         parse_environment(joint_desc, *options);
         parse_config_file(joint_desc, *options);
 
-        module_options[module] = options;
+        module_options[module.get_handle()] = options;
         parsed_options = options;
     }
 

From 46b165c620957a29947af52193d96cbaf816b8e3 Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue, 10 Sep 2024 13:57:04 +1000
Subject: [PATCH 08/18] Run symbols-generator to placate it

---
 src/common/symbols.map | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/common/symbols.map b/src/common/symbols.map
index c49859b90f9..1110f1bd90b 100644
--- a/src/common/symbols.map
+++ b/src/common/symbols.map
@@ -323,12 +323,11 @@ global:
     mir::RecursiveReadWriteMutex::write_lock*;
     mir::RecursiveReadWriteMutex::write_unlock*;
     mir::SharedLibrary::?SharedLibrary*;
-    mir::SharedLibrary::SharedLibrary*;
-    mir::SharedLibrary::load_symbol*;
-    mir::SharedLibrary::get_handle*;
     mir::SharedLibrary::Handle::?Handle*;
     mir::SharedLibrary::Handle::operator*;
-    std::hash?mir::SharedLibrary::Handle?::operator*;
+    mir::SharedLibrary::SharedLibrary*;
+    mir::SharedLibrary::get_handle*;
+    mir::SharedLibrary::load_symbol*;
     mir::SharedLibraryProberReport::?SharedLibraryProberReport*;
     mir::SharedLibraryProberReport::SharedLibraryProberReport*;
     mir::SharedLibraryProberReport::operator*;
@@ -489,6 +488,7 @@ global:
     non-virtual?thunk?to?mir::logging::Logger::log*;
     non-virtual?thunk?to?mir::logging::MultiLogger::log*;
     operator*;
+    std::hash?mir::SharedLibrary::Handle?::operator*;
     typeinfo?for?MirInputConfig;
     typeinfo?for?MirInputDevice;
     typeinfo?for?MirKeyboardConfig;
@@ -503,8 +503,8 @@ global:
     typeinfo?for?mir::IntOwnedFd;
     typeinfo?for?mir::NonBlockingExecutor;
     typeinfo?for?mir::PosixRWMutex;
-    typeinfo?for?mir::SharedLibrary;
     typeinfo?for?mir::SharedLibrary::Handle;
+    typeinfo?for?mir::SharedLibrary;
     typeinfo?for?mir::SharedLibraryProberReport;
     typeinfo?for?mir::Signal;
     typeinfo?for?mir::ThreadPoolExecutor;
@@ -696,8 +696,12 @@ global:
 };
 
 MIR_COMMON_2.18 {
-  global: extern "C++" {
+global:
+  extern "C++" {
     MirTouchpadConfig::disable_with_external_mouse*;
     mir::event_type_to_c_str*;
+    std::hash::operator*;
+    typeinfo?for?std::hash;
   };
 } MIR_COMMON_2.17;
+

From 3010703d8d70cfd2f9095a542f145854877c0cfc Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue, 10 Sep 2024 13:58:43 +1000
Subject: [PATCH 09/18] m/g/platform_probe.cpp: Sort headers according to style

---
 src/server/graphics/platform_probe.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/server/graphics/platform_probe.cpp b/src/server/graphics/platform_probe.cpp
index db707a7cf52..0584bcd2915 100644
--- a/src/server/graphics/platform_probe.cpp
+++ b/src/server/graphics/platform_probe.cpp
@@ -14,7 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "mir/graphics/default_display_configuration_policy.h"
+ #include "platform_probe.h"
+
 #include "mir/graphics/display.h"
 #include "mir/log.h"
 #include "mir/graphics/platform.h"
@@ -24,8 +25,6 @@
 #include "mir/shared_library_prober_report.h"
 #include "mir/udev/wrapper.h"
 
-#include "platform_probe.h"
-
 #include <algorithm>
 #include <boost/throw_exception.hpp>
 #include <dlfcn.h>

From 7fd62d0a874dcf57c5a0430b634fcc3a4bcae524 Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Tue, 10 Sep 2024 14:45:13 +1000
Subject: [PATCH 10/18] Appease that beast of the apocalypse a little more

---
 src/server/symbols.map | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/symbols.map b/src/server/symbols.map
index bcdc5a9de6d..e2028e4ff35 100644
--- a/src/server/symbols.map
+++ b/src/server/symbols.map
@@ -68,6 +68,7 @@ global:
     mir::DefaultServerConfiguration::the_main_loop*;
     mir::DefaultServerConfiguration::the_mediating_display_changer*;
     mir::DefaultServerConfiguration::the_options*;
+    mir::DefaultServerConfiguration::the_options_provider*;
     mir::DefaultServerConfiguration::the_persistent_surface_store*;
     mir::DefaultServerConfiguration::the_pointer_input_dispatcher*;
     mir::DefaultServerConfiguration::the_primary_selection_clipboard*;

From 4c704004ff42f4ecf4afacf2f909f20da9e54770 Mon Sep 17 00:00:00 2001
From: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Thu, 12 Sep 2024 10:11:53 +1000
Subject: [PATCH 11/18] tests/PlatformProbe: Fix stack-use-after-return

---
 tests/unit-tests/graphics/test_platform_prober.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit-tests/graphics/test_platform_prober.cpp b/tests/unit-tests/graphics/test_platform_prober.cpp
index e607abfa613..a4af4ffc280 100644
--- a/tests/unit-tests/graphics/test_platform_prober.cpp
+++ b/tests/unit-tests/graphics/test_platform_prober.cpp
@@ -639,7 +639,7 @@ class FullProbeStack : public testing::Test
 
     auto the_options() -> mir::options::Option const&
     {
-        char const* argv0 = "Platform Probing Acceptance Test";
+        static char const* argv0 = "Platform Probing Acceptance Test";
 
         /* We remake options each time the_options() is called as option parsing
          * happens at options->the_options() time and we want to make sure we capture

From 3829f96744c0cd1246a16a84cd6e93ba79a03508 Mon Sep 17 00:00:00 2001
From: Tarek Ismail <tarek.ismail@canonical.com>
Date: Mon, 30 Sep 2024 18:43:54 +0300
Subject: [PATCH 12/18] Rename `OptionsProvider` back to `Configuration`

---
 include/platform/mir/options/configuration.h          | 10 +++++-----
 include/platform/mir/options/default_configuration.h  |  2 +-
 src/include/server/mir/default_server_configuration.h |  8 ++++----
 src/server/default_server_configuration.cpp           |  4 ++--
 src/server/graphics/platform_probe.cpp                |  6 +++---
 src/server/graphics/platform_probe.h                  |  8 ++++----
 src/server/server.cpp                                 |  2 +-
 tests/unit-tests/graphics/test_platform_prober.cpp    |  6 +++---
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/include/platform/mir/options/configuration.h b/include/platform/mir/options/configuration.h
index f37a2bbf5be..483dd20844f 100644
--- a/include/platform/mir/options/configuration.h
+++ b/include/platform/mir/options/configuration.h
@@ -68,7 +68,7 @@ extern char const* const auto_console;
 
 extern char const* const vt_option_name;
 
-class OptionsProvider
+class Configuration
 {
 public:
     /**
@@ -81,11 +81,11 @@ class OptionsProvider
     virtual auto the_options_for(SharedLibrary const& module) const -> std::shared_ptr<options::Option> = 0;
 
 protected:
-    OptionsProvider() = default;
-    virtual ~OptionsProvider() = default;
+    Configuration() = default;
+    virtual ~Configuration() = default;
 
-    OptionsProvider(OptionsProvider const&) = delete;
-    OptionsProvider& operator=(OptionsProvider const&) = delete;
+    Configuration(Configuration const&) = delete;
+    Configuration& operator=(Configuration const&) = delete;
 };
 }
 }
diff --git a/include/platform/mir/options/default_configuration.h b/include/platform/mir/options/default_configuration.h
index cd7d2e62a68..9d6c9cf0709 100644
--- a/include/platform/mir/options/default_configuration.h
+++ b/include/platform/mir/options/default_configuration.h
@@ -28,7 +28,7 @@ namespace mir
 {
 namespace options
 {
-class DefaultConfiguration : public OptionsProvider
+class DefaultConfiguration : public Configuration
 {
 public:
     DefaultConfiguration(int argc, char const* argv[]);
diff --git a/src/include/server/mir/default_server_configuration.h b/src/include/server/mir/default_server_configuration.h
index e62866e3549..d45704920ae 100644
--- a/src/include/server/mir/default_server_configuration.h
+++ b/src/include/server/mir/default_server_configuration.h
@@ -138,7 +138,7 @@ class Logger;
 namespace options
 {
 class Option;
-class OptionsProvider;
+class Configuration;
 }
 
 namespace report
@@ -161,7 +161,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
 {
 public:
     DefaultServerConfiguration(int argc, char const* argv[]);
-    explicit DefaultServerConfiguration(std::shared_ptr<options::OptionsProvider> const& configuration_options);
+    explicit DefaultServerConfiguration(std::shared_ptr<options::Configuration> const& configuration_options);
 
     /** @name DisplayServer dependencies
      * dependencies of DisplayServer on the rest of the Mir
@@ -348,7 +348,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
 
 protected:
     std::shared_ptr<options::Option> the_options() const;
-    auto the_options_provider() const -> std::shared_ptr<options::OptionsProvider>;
+    auto the_options_provider() const -> std::shared_ptr<options::Configuration>;
     std::shared_ptr<input::DefaultInputDeviceHub>  the_default_input_device_hub();
     std::shared_ptr<graphics::DisplayConfigurationObserver> the_display_configuration_observer();
     std::shared_ptr<input::SeatObserver> the_seat_observer();
@@ -436,7 +436,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
     std::shared_ptr<DecorationStrategy> decoration_strategy;
 
 private:
-    std::shared_ptr<options::OptionsProvider> const configuration_options;
+    std::shared_ptr<options::Configuration> const configuration_options;
     std::shared_ptr<input::EventFilter> default_filter;
     CachedPtr<ObserverMultiplexer<graphics::DisplayConfigurationObserver>>
         display_configuration_observer_multiplexer;
diff --git a/src/server/default_server_configuration.cpp b/src/server/default_server_configuration.cpp
index 80c5faff6d7..ee6923612e0 100644
--- a/src/server/default_server_configuration.cpp
+++ b/src/server/default_server_configuration.cpp
@@ -56,7 +56,7 @@ mir::DefaultServerConfiguration::DefaultServerConfiguration(int argc, char const
 {
 }
 
-mir::DefaultServerConfiguration::DefaultServerConfiguration(std::shared_ptr<mo::OptionsProvider> const& configuration_options) :
+mir::DefaultServerConfiguration::DefaultServerConfiguration(std::shared_ptr<mo::Configuration> const& configuration_options) :
     configuration_options(configuration_options),
     enabled_wayland_extensions(frontend::get_standard_extensions())
 {
@@ -69,7 +69,7 @@ auto mir::DefaultServerConfiguration::the_options() const
 }
 
 auto mir::DefaultServerConfiguration::the_options_provider() const
-    -> std::shared_ptr<mo::OptionsProvider>
+    -> std::shared_ptr<mo::Configuration>
 {
     return configuration_options;
 }
diff --git a/src/server/graphics/platform_probe.cpp b/src/server/graphics/platform_probe.cpp
index 0584bcd2915..d28c234251c 100644
--- a/src/server/graphics/platform_probe.cpp
+++ b/src/server/graphics/platform_probe.cpp
@@ -282,7 +282,7 @@ auto mg::modules_for_device(
 
 auto mir::graphics::display_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
-    mo::OptionsProvider const& options,
+    mo::Configuration const& options,
     std::shared_ptr<ConsoleServices> const& console) -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>
 {
     return modules_for_device(
@@ -297,7 +297,7 @@ auto mir::graphics::display_modules_for_device(
 auto mir::graphics::rendering_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
     std::span<std::shared_ptr<DisplayPlatform>> const& platforms,
-    mo::OptionsProvider const& options,
+    mo::Configuration const& options,
     std::shared_ptr<ConsoleServices> const& console) -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>
 {
     return modules_for_device(
@@ -392,7 +392,7 @@ auto dso_filename_alphabetically_before(mir::SharedLibrary const& a, mir::Shared
 }
 
 auto mg::select_display_modules(
-    options::OptionsProvider const& options,
+    options::Configuration const& options,
     std::shared_ptr<ConsoleServices> const& console,
     SharedLibraryProberReport& lib_loader_report)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>
diff --git a/src/server/graphics/platform_probe.h b/src/server/graphics/platform_probe.h
index ffb0cd91036..f71a08a9a07 100644
--- a/src/server/graphics/platform_probe.h
+++ b/src/server/graphics/platform_probe.h
@@ -29,7 +29,7 @@ class ConsoleServices;
 
 namespace options
 {
-class OptionsProvider;
+class Configuration;
 }
 
 namespace graphics
@@ -61,19 +61,19 @@ auto probe_rendering_module(
 
 auto display_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
-    options::OptionsProvider const& options,
+    options::Configuration const& options,
     std::shared_ptr<ConsoleServices> const& console)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>;
 
 auto rendering_modules_for_device(
     std::vector<std::shared_ptr<SharedLibrary>> const& modules,
     std::span<std::shared_ptr<DisplayPlatform>> const& platforms,
-    options::OptionsProvider const& options,
+    options::Configuration const& options,
     std::shared_ptr<ConsoleServices> const& console)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>;
 
 auto select_display_modules(
-    options::OptionsProvider const& options,
+    options::Configuration const& options,
     std::shared_ptr<ConsoleServices> const& console,
     SharedLibraryProberReport& lib_loader_report)
     -> std::vector<std::pair<SupportedDevice, std::shared_ptr<SharedLibrary>>>;
diff --git a/src/server/server.cpp b/src/server/server.cpp
index 8d31a61bb5f..3126ca86b9b 100644
--- a/src/server/server.cpp
+++ b/src/server/server.cpp
@@ -208,7 +208,7 @@ auto wrap_##name(decltype(Self::name##_wrapper)::result_type const& wrapped)\
 struct mir::Server::ServerConfiguration : mir::DefaultServerConfiguration
 {
     ServerConfiguration(
-        std::shared_ptr<options::OptionsProvider> const& configuration_options,
+        std::shared_ptr<options::Configuration> const& configuration_options,
         std::shared_ptr<Self> const& self) :
         DefaultServerConfiguration(configuration_options),
         self(self.get())
diff --git a/tests/unit-tests/graphics/test_platform_prober.cpp b/tests/unit-tests/graphics/test_platform_prober.cpp
index a4af4ffc280..260b5cc9516 100644
--- a/tests/unit-tests/graphics/test_platform_prober.cpp
+++ b/tests/unit-tests/graphics/test_platform_prober.cpp
@@ -182,7 +182,7 @@ class ServerPlatformProbeMockDRM : public ::testing::Test
 #endif
 };
 
-class StubOptionsProvider : public mo::OptionsProvider
+class StubOptionsProvider : public mo::Configuration
 {
 public:
     StubOptionsProvider() = default;
@@ -653,7 +653,7 @@ class FullProbeStack : public testing::Test
         return *(options->global_options());
     }
 
-    auto the_options_provider() -> mo::OptionsProvider const&
+    auto the_options_provider() -> mo::Configuration const&
     {
         if (!options)
         {
@@ -683,7 +683,7 @@ class FullProbeStack : public testing::Test
      * would call mo::Configuration::~Configiration and fail, whereas std::make_shared<mo::DefaultConfiguration> will capture
      * mo::DefaultConfiguration::~DefaultConfiguration and compile.
      */
-    std::shared_ptr<mo::OptionsProvider> options;
+    std::shared_ptr<mo::Configuration> options;
     std::shared_ptr<mir::SharedLibraryProberReport> const report;
 
     std::vector<std::unique_ptr<mtf::TemporaryEnvironmentValue>> temporary_env;

From 86950816bd273f9d7846771c7cdbef07fdc1c605 Mon Sep 17 00:00:00 2001
From: Tarek Ismail <tarek.ismail@canonical.com>
Date: Mon, 30 Sep 2024 18:47:10 +0300
Subject: [PATCH 13/18] Rename `Configuration::the_options_for` to
 `options_for`

---
 include/platform/mir/options/configuration.h         | 2 +-
 include/platform/mir/options/default_configuration.h | 2 +-
 src/platform/options/default_configuration.cpp       | 2 +-
 src/server/graphics/default_configuration.cpp        | 4 ++--
 src/server/graphics/platform_probe.cpp               | 8 ++++----
 tests/unit-tests/graphics/test_platform_prober.cpp   | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/platform/mir/options/configuration.h b/include/platform/mir/options/configuration.h
index 483dd20844f..94a7721e94f 100644
--- a/include/platform/mir/options/configuration.h
+++ b/include/platform/mir/options/configuration.h
@@ -78,7 +78,7 @@ class Configuration
     /**
      * All options, including those added by the specified module
      */
-    virtual auto the_options_for(SharedLibrary const& module) const -> std::shared_ptr<options::Option> = 0;
+    virtual auto options_for(SharedLibrary const& module) const -> std::shared_ptr<options::Option> = 0;
 
 protected:
     Configuration() = default;
diff --git a/include/platform/mir/options/default_configuration.h b/include/platform/mir/options/default_configuration.h
index 9d6c9cf0709..0f60d707e07 100644
--- a/include/platform/mir/options/default_configuration.h
+++ b/include/platform/mir/options/default_configuration.h
@@ -56,7 +56,7 @@ class DefaultConfiguration : public Configuration
     void add_platform_options();
     // accessed via the base interface, when access to add_options() has been "lost"
     std::shared_ptr<options::Option> global_options() const override;
-    auto the_options_for(SharedLibrary const& module) const -> std::shared_ptr<Option> override;
+    auto options_for(SharedLibrary const& module) const -> std::shared_ptr<Option> override;
 
     virtual void parse_arguments(
         boost::program_options::options_description desc,
diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
index 8a809249685..5d3793676c8 100644
--- a/src/platform/options/default_configuration.cpp
+++ b/src/platform/options/default_configuration.cpp
@@ -300,7 +300,7 @@ std::shared_ptr<mo::Option> mo::DefaultConfiguration::global_options() const
     return options;
 }
 
-auto mo::DefaultConfiguration::the_options_for(SharedLibrary const& module) const -> std::shared_ptr<Option>
+auto mo::DefaultConfiguration::options_for(SharedLibrary const& module) const -> std::shared_ptr<Option>
 {
     auto parsed_options = module_options[module.get_handle()];
     if (!parsed_options)
diff --git a/src/server/graphics/default_configuration.cpp b/src/server/graphics/default_configuration.cpp
index 73c295f42e3..43a008368e3 100644
--- a/src/server/graphics/default_configuration.cpp
+++ b/src/server/graphics/default_configuration.cpp
@@ -178,7 +178,7 @@ auto mir::DefaultServerConfiguration::the_display_platforms() -> std::vector<std
                 display_platforms.push_back(
                     create_display_platform(
                         device,
-                        the_options_provider()->the_options_for(*platform),
+                        the_options_provider()->options_for(*platform),
                         the_emergency_cleanup(),
                         the_console_services(),
                         the_display_report()));
@@ -302,7 +302,7 @@ auto mir::DefaultServerConfiguration::the_rendering_platforms() ->
                     create_rendering_platform(
                         device,
                         display_targets,
-                        *the_options_provider()->the_options_for(*platform),
+                        *the_options_provider()->options_for(*platform),
                         *the_emergency_cleanup()));
                 // Add this module to the list searched by the input stack later
                 // TODO: Come up with a more principled solution for combined input/rendering/output platforms
diff --git a/src/server/graphics/platform_probe.cpp b/src/server/graphics/platform_probe.cpp
index d28c234251c..518e8a28d13 100644
--- a/src/server/graphics/platform_probe.cpp
+++ b/src/server/graphics/platform_probe.cpp
@@ -288,7 +288,7 @@ auto mir::graphics::display_modules_for_device(
     return modules_for_device(
         [&options, &console](mir::SharedLibrary const& module) -> std::vector<mg::SupportedDevice>
         {
-            return mg::probe_display_module(module, *options.the_options_for(module), console);
+            return mg::probe_display_module(module, *options.options_for(module), console);
         },
         modules,
         TypePreference::prefer_nested);
@@ -305,7 +305,7 @@ auto mir::graphics::rendering_modules_for_device(
         {
             if (is_graphics_module(module))
             {
-                return probe_rendering_module(platforms, module, *options.the_options_for(module), console);
+                return probe_rendering_module(platforms, module, *options.options_for(module), console);
             }
             else
             {
@@ -478,7 +478,7 @@ auto mg::select_display_modules(
             auto supported_devices =
                 graphics::probe_display_module(
                     *platform,
-                    *options.the_options_for(*platform),
+                    *options.options_for(*platform),
                     console);
 
             bool found_supported_device{false};
@@ -530,7 +530,7 @@ auto mg::select_display_modules(
     if (virtual_platform)
     {
         auto virtual_probe = probe_display_module(
-            *virtual_platform, *options.the_options_for(*virtual_platform), console);
+            *virtual_platform, *options.options_for(*virtual_platform), console);
         if (virtual_probe.size() && virtual_probe.front().support_level >= mg::probe::supported)
         {
             platform_modules.emplace_back(std::move(virtual_probe.front()), std::move(virtual_platform));
diff --git a/tests/unit-tests/graphics/test_platform_prober.cpp b/tests/unit-tests/graphics/test_platform_prober.cpp
index 260b5cc9516..cd3609f3a98 100644
--- a/tests/unit-tests/graphics/test_platform_prober.cpp
+++ b/tests/unit-tests/graphics/test_platform_prober.cpp
@@ -193,7 +193,7 @@ class StubOptionsProvider : public mo::Configuration
         return std::make_shared<mo::ProgramOption>();
     }
 
-    auto the_options_for(mir::SharedLibrary const& /*module*/) const -> std::shared_ptr<mo::Option> override
+    auto options_for(mir::SharedLibrary const& /*module*/) const -> std::shared_ptr<mo::Option> override
     {
         return std::make_shared<mo::ProgramOption>();
     }

From 9cf38fa26ac3c58ad25dbc151122bf807be389f4 Mon Sep 17 00:00:00 2001
From: Tarek Ismail <tarek.ismail@canonical.com>
Date: Mon, 30 Sep 2024 18:48:15 +0300
Subject: [PATCH 14/18] Remove unused catch variable

---
 src/platform/options/default_configuration.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/platform/options/default_configuration.cpp b/src/platform/options/default_configuration.cpp
index 5d3793676c8..fe3d84a748a 100644
--- a/src/platform/options/default_configuration.cpp
+++ b/src/platform/options/default_configuration.cpp
@@ -252,7 +252,7 @@ void mo::DefaultConfiguration::add_platform_options()
 
                 add_platform_options(options->second);
             }
-            catch (std::runtime_error& e)
+            catch (std::runtime_error&)
             {
                 /* We've failed to add the options - probably because it's not a graphics platform,
                  * or because it's got the wrong version - unload it; it's unnecessary.

From ca44d8439dbb56b3f9da46b8ebc49c0feba434cc Mon Sep 17 00:00:00 2001
From: Tarek Ismail <tarek.ismail@canonical.com>
Date: Wed, 2 Oct 2024 11:03:54 +0300
Subject: [PATCH 15/18] Move new symbols from 2.17 and 2.18 stenzas to 2.19

---
 src/common/symbols.map | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/common/symbols.map b/src/common/symbols.map
index 1110f1bd90b..eef107f733a 100644
--- a/src/common/symbols.map
+++ b/src/common/symbols.map
@@ -323,10 +323,7 @@ global:
     mir::RecursiveReadWriteMutex::write_lock*;
     mir::RecursiveReadWriteMutex::write_unlock*;
     mir::SharedLibrary::?SharedLibrary*;
-    mir::SharedLibrary::Handle::?Handle*;
-    mir::SharedLibrary::Handle::operator*;
     mir::SharedLibrary::SharedLibrary*;
-    mir::SharedLibrary::get_handle*;
     mir::SharedLibrary::load_symbol*;
     mir::SharedLibraryProberReport::?SharedLibraryProberReport*;
     mir::SharedLibraryProberReport::SharedLibraryProberReport*;
@@ -696,12 +693,16 @@ global:
 };
 
 MIR_COMMON_2.18 {
-global:
-  extern "C++" {
+  global: extern "C++" {
     MirTouchpadConfig::disable_with_external_mouse*;
     mir::event_type_to_c_str*;
-    std::hash::operator*;
-    typeinfo?for?std::hash;
   };
 } MIR_COMMON_2.17;
 
+MIR_COMMON_2.19 {
+  global: extern "C++" {
+    mir::SharedLibrary::Handle::?Handle*;
+    mir::SharedLibrary::Handle::operator*;
+    mir::SharedLibrary::get_handle*;
+  };
+} MIR_COMMON_2.18;

From 008af618b8e04e585519e0c0e866d436bdf1d7d6 Mon Sep 17 00:00:00 2001
From: Tarek Ismail <tarek.ismail@canonical.com>
Date: Wed, 2 Oct 2024 12:00:48 +0300
Subject: [PATCH 16/18] Move more stray symbols from 2.17 stenza to 2.19

---
 src/common/symbols.map | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/symbols.map b/src/common/symbols.map
index eef107f733a..fd9aab56b75 100644
--- a/src/common/symbols.map
+++ b/src/common/symbols.map
@@ -485,7 +485,6 @@ global:
     non-virtual?thunk?to?mir::logging::Logger::log*;
     non-virtual?thunk?to?mir::logging::MultiLogger::log*;
     operator*;
-    std::hash?mir::SharedLibrary::Handle?::operator*;
     typeinfo?for?MirInputConfig;
     typeinfo?for?MirInputDevice;
     typeinfo?for?MirKeyboardConfig;
@@ -500,7 +499,6 @@ global:
     typeinfo?for?mir::IntOwnedFd;
     typeinfo?for?mir::NonBlockingExecutor;
     typeinfo?for?mir::PosixRWMutex;
-    typeinfo?for?mir::SharedLibrary::Handle;
     typeinfo?for?mir::SharedLibrary;
     typeinfo?for?mir::SharedLibraryProberReport;
     typeinfo?for?mir::Signal;
@@ -704,5 +702,7 @@ MIR_COMMON_2.19 {
     mir::SharedLibrary::Handle::?Handle*;
     mir::SharedLibrary::Handle::operator*;
     mir::SharedLibrary::get_handle*;
+    std::hash?mir::SharedLibrary::Handle?::operator*;
+    typeinfo?for?mir::SharedLibrary::Handle;
   };
 } MIR_COMMON_2.18;

From b2776402242195848dc21483b46e5e889dcf2e1d Mon Sep 17 00:00:00 2001
From: Matthew Kosarek <matt.kosarek@canonical.com>
Date: Mon, 7 Oct 2024 11:05:38 -0400
Subject: [PATCH 17/18] SharedLibrary::Handle no longer defines the hash
 function in std

---
 include/common/mir/shared_library.h               | 15 ++++++++-------
 .../platform/mir/options/default_configuration.h  |  4 ++--
 src/common/sharedlibrary/shared_library.cpp       |  6 ------
 src/common/symbols.map                            |  9 +++++++--
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/include/common/mir/shared_library.h b/include/common/mir/shared_library.h
index 5972635e2b2..cba7bd6fb40 100644
--- a/include/common/mir/shared_library.h
+++ b/include/common/mir/shared_library.h
@@ -57,9 +57,16 @@ class SharedLibrary
         auto operator<=>(Handle const& rhs) const -> std::strong_ordering;
         auto operator==(Handle const& rhs) const -> bool = default;
         auto operator!=(Handle const& rhs) const -> bool = default;
+
+        struct HandleHash
+        {
+            std::size_t operator()(const Handle& h) const noexcept
+            {
+                return std::hash<void*>{}(h.handle);
+            }
+        };
     private:
         friend class SharedLibrary;
-        friend struct std::hash<Handle>;
 
         Handle(void* handle);
         void* handle;
@@ -75,10 +82,4 @@ class SharedLibrary
 };
 }
 
-template<>
-struct std::hash<mir::SharedLibrary::Handle>
-{
-    auto operator()(mir::SharedLibrary::Handle const& h) const noexcept -> std::size_t;
-};
-
 #endif /* MIR_SHARED_LIBRARY_H_ */
diff --git a/include/platform/mir/options/default_configuration.h b/include/platform/mir/options/default_configuration.h
index 0f60d707e07..22b6355e39a 100644
--- a/include/platform/mir/options/default_configuration.h
+++ b/include/platform/mir/options/default_configuration.h
@@ -77,8 +77,8 @@ class DefaultConfiguration : public Configuration
     std::function<void(int argc, char const* const* argv)> const unparsed_arguments_handler;
     std::shared_ptr<boost::program_options::options_description> const program_options;
 
-    std::unordered_map<SharedLibrary::Handle, boost::program_options::options_description> module_options_desc;
-    std::unordered_map<SharedLibrary::Handle, std::shared_ptr<Option>> mutable module_options;
+    std::unordered_map<SharedLibrary::Handle, boost::program_options::options_description, SharedLibrary::Handle::HandleHash> module_options_desc;
+    std::unordered_map<SharedLibrary::Handle, std::shared_ptr<Option>, SharedLibrary::Handle::HandleHash> mutable module_options;
     std::shared_ptr<Option> mutable options;
 };
 }
diff --git a/src/common/sharedlibrary/shared_library.cpp b/src/common/sharedlibrary/shared_library.cpp
index bd0b399d23c..bc5835c21d6 100644
--- a/src/common/sharedlibrary/shared_library.cpp
+++ b/src/common/sharedlibrary/shared_library.cpp
@@ -91,9 +91,3 @@ auto mir::SharedLibrary::Handle::operator<=>(Handle const& rhs) const -> std::st
 {
     return handle <=> rhs.handle;
 }
-
-auto std::hash<mir::SharedLibrary::Handle>::operator()(mir::SharedLibrary::Handle const& handle) const noexcept
-    -> std::size_t
-{
-    return std::hash<void*>{}(handle.handle);
-}
diff --git a/src/common/symbols.map b/src/common/symbols.map
index fd9aab56b75..14496e7a6da 100644
--- a/src/common/symbols.map
+++ b/src/common/symbols.map
@@ -691,18 +691,23 @@ global:
 };
 
 MIR_COMMON_2.18 {
-  global: extern "C++" {
+global:
+  extern "C++" {
     MirTouchpadConfig::disable_with_external_mouse*;
     mir::event_type_to_c_str*;
   };
 } MIR_COMMON_2.17;
 
 MIR_COMMON_2.19 {
-  global: extern "C++" {
+global:
+  extern "C++" {
     mir::SharedLibrary::Handle::?Handle*;
     mir::SharedLibrary::Handle::operator*;
     mir::SharedLibrary::get_handle*;
+    mir::SharedLibrary::Handle::HandleHash::operator*;
     std::hash?mir::SharedLibrary::Handle?::operator*;
     typeinfo?for?mir::SharedLibrary::Handle;
+    typeinfo?for?mir::SharedLibrary::Handle::HandleHash;
   };
 } MIR_COMMON_2.18;
+

From 65ab9639ea1752a7c6c2b8fbfb0f352d7a35e116 Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Tue, 8 Oct 2024 11:46:04 +0100
Subject: [PATCH 18/18] Reinstate ProgramOptionEnv.parse_environment

---
 .../options/test_program_option.cpp           | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tests/unit-tests/options/test_program_option.cpp b/tests/unit-tests/options/test_program_option.cpp
index a0ddfa66c8d..acc1481a651 100644
--- a/tests/unit-tests/options/test_program_option.cpp
+++ b/tests/unit-tests/options/test_program_option.cpp
@@ -209,6 +209,50 @@ TEST_F(ProgramOption, unparsed_command_line_returns_unprocessed_tokens)
     EXPECT_THAT(po.unparsed_command_line(), ElementsAre("--hello", "world", "--answer", "42"));
 }
 
+TEST(ProgramOptionEnv, parse_environment)
+{
+    // Env variables should be uppercase and "_" delimited
+    char const* name = "some-key";
+    char const* key = "SOME_KEY";
+    char const* value = "test_value";
+    auto const prefix = std::string{__PRETTY_FUNCTION__} + "_";
+
+    auto const mapper = [&prefix](std::string const& from) -> std::string
+    {
+        if (from.starts_with(prefix))
+        {
+            auto result = from.substr(prefix.size());
+
+            for(auto& ch : result)
+            {
+                if (ch == '_') ch = '-';
+                else ch = std::tolower(ch, std::locale::classic());
+            }
+
+            return result;
+        }
+        else
+        {
+            return std::string{};
+        }
+    };
+
+    auto const env = prefix + key;
+    setenv(env.c_str(), value, true);
+
+    bpo::options_description desc;
+    desc.add_options()
+        (name, bpo::value<std::string>());
+
+    mir::options::ProgramOption po;
+    po.parse_environment(desc, mapper);
+
+    EXPECT_EQ(value, po.get(name, "default"));
+    EXPECT_EQ("default", po.get("garbage", "default"));
+    EXPECT_TRUE(po.is_set(name));
+    EXPECT_FALSE(po.is_set("garbage"));
+}
+
 // TODO need to parse something
 TEST(ProgramOptionFile, parse_files)
 {