Skip to content

Support for loading multiple configurations as addons #762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SebSparrowHawk wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Support for loading multiple configurations as addons #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fafa1d
Support for loading multiple configurations as addons
SebSparrowHawk Jul 17, 2026
51d36b1
Reimplemented based on changed requirements
SebSparrowHawk Jul 27, 2026
65f851a
Introduce wrapper for configuration's service instances map
SebSparrowHawk Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
222 changes: 189 additions & 33 deletions score/mw/com/api_surface.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"target": "//score/mw/com:com",
"target": ":com",
"symbols": [
{
"name": "ComErrc",
Expand Down Expand Up @@ -31,6 +31,18 @@
"kind": "function",
"signature": "InitializeRuntime : void (const std::int32_t, score::StringLiteral *)"
},
{
"name": "InitializeRuntimeAddonConfiguration",
"qualified_name": "score::mw::com::runtime::InitializeRuntimeAddonConfiguration",
"kind": "function",
"signature": "InitializeRuntimeAddonConfiguration : Result<void> (const RuntimeConfiguration &)"
},
{
"name": "InitializeRuntimeAddonConfiguration",
"qualified_name": "score::mw::com::runtime::InitializeRuntimeAddonConfiguration",
"kind": "function",
"signature": "InitializeRuntimeAddonConfiguration : Result<void> (score::json::Any)"
},
{
"name": "InitializeRuntime",
"qualified_name": "score::mw::com::runtime::InitializeRuntime",
Expand Down Expand Up @@ -385,14 +397,140 @@
"name": "ErrorDomain",
"qualified_name": "score::mw::com::ComErrorDomain::ErrorDomain",
"kind": "constructor",
"signature": "ErrorDomain : void ()"
"signature": "ErrorDomain : void () noexcept"
},
{
"name": "MessageFor",
"qualified_name": "score::mw::com::ComErrorDomain::MessageFor",
"kind": "method",
"signature": "MessageFor : std::string_view (const score::result::ErrorCode &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::lola::ElementFqId &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::lola::ProxyMethodInstanceIdentifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::lola::UniqueMethodIdentifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::lola::ProxyInstanceIdentifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::lola::LolaServiceInstanceIdentifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::lola::SkeletonInstanceIdentifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : size_t (const score::mw::com::impl::ServiceIdentifierType &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::FindServiceHandle &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::HandleType &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::InstanceIdentifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : std::size_t (const score::mw::com::impl::InstanceSpecifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : size_t (const score::mw::com::impl::tracing::ServiceElementIdentifier &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : size_t (const score::mw::com::impl::tracing::ServiceElementIdentifierView &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : size_t (const score::mw::com::impl::tracing::ServiceElementInstanceIdentifierView &) const noexcept"
},
{
"name": "operator()",
"qualified_name": "std::operator()",
"kind": "method",
"signature": "operator() : size_t (const score::mw::com::impl::tracing::TracePointKey &) const noexcept"
},
{
"name": "IRuntime",
"qualified_name": "score::mw::com::runtime::IRuntime",
"kind": "class",
"signature": "class IRuntime"
},
{
"name": "IRuntime",
"qualified_name": "score::mw::com::runtime::IRuntime::IRuntime",
"kind": "constructor",
"signature": "IRuntime : void ()"
},
{
"name": "~IRuntime",
"qualified_name": "score::mw::com::runtime::IRuntime::~IRuntime",
"kind": "destructor",
"signature": "~IRuntime : void ()"
},
{
"name": "ResolveInstanceIDs",
"qualified_name": "score::mw::com::runtime::IRuntime::ResolveInstanceIDs",
"kind": "method",
"signature": "ResolveInstanceIDs : score::Result<InstanceIdentifierContainer> (const InstanceSpecifier)"
},
{
"name": "InitializeRuntime",
"qualified_name": "score::mw::com::runtime::IRuntime::InitializeRuntime",
"kind": "method",
"signature": "InitializeRuntime : void (const std::int32_t, score::cpp::span<const score::StringLiteral>)"
},
{
"name": "InitializeRuntime",
"qualified_name": "score::mw::com::runtime::IRuntime::InitializeRuntime",
"kind": "method",
"signature": "InitializeRuntime : void (const runtime::RuntimeConfiguration &)"
},
{
"name": "RuntimeConfiguration",
"qualified_name": "score::mw::com::runtime::RuntimeConfiguration::RuntimeConfiguration",
Expand Down Expand Up @@ -477,30 +615,48 @@
"kind": "template_type_alias",
"signature": "using SamplePtr = impl::SamplePtr<SampleType>"
},
{
"name": "Get",
"qualified_name": "score::mw::com::SamplePtr::Get",
"kind": "method",
"signature": "Get : pointer () const noexcept"
},
{
"name": "Reset",
"qualified_name": "score::mw::com::SamplePtr::Reset",
"kind": "method",
"signature": "Reset : void (SamplePtr<SampleType>) noexcept"
},
{
"name": "SamplePtr<SampleType>",
"qualified_name": "score::mw::com::SamplePtr::SamplePtr<SampleType>",
"kind": "constructor",
"signature": "SamplePtr<SampleType> : void () noexcept"
"kind": "template_function",
"signature": "SamplePtr<SampleType>"
},
{
"name": "SamplePtr<SampleType>",
"qualified_name": "score::mw::com::SamplePtr::SamplePtr<SampleType>",
"kind": "constructor",
"signature": "SamplePtr<SampleType> : void (std::nullptr_t) noexcept"
"signature": "SamplePtr<SampleType> : void () noexcept"
},
{
"name": "SamplePtr<SampleType>",
"qualified_name": "score::mw::com::SamplePtr::SamplePtr<SampleType>",
"kind": "constructor",
"signature": "SamplePtr<SampleType> : void (pointer, ConsumerEventDataControlLocalView<> &, const SlotIndexType) noexcept"
"signature": "SamplePtr<SampleType> : void (std::nullptr_t) noexcept"
},
{
"name": "SamplePtr<SampleType>",
"qualified_name": "score::mw::com::SamplePtr::SamplePtr<SampleType>",
"kind": "constructor",
"signature": "SamplePtr<SampleType> : void (SamplePtr<SampleType> &&) noexcept"
},
{
"name": "Swap",
"qualified_name": "score::mw::com::SamplePtr::Swap",
"kind": "method",
"signature": "Swap : void (SamplePtr<SampleType> &) noexcept"
},
{
"name": "get",
"qualified_name": "score::mw::com::SamplePtr::get",
Expand All @@ -511,25 +667,37 @@
"name": "operator*",
"qualified_name": "score::mw::com::SamplePtr::operator*",
"kind": "template_function",
"signature": "operator* : typename std::add_lvalue_reference<const SampleType>::type () const noexcept"
"signature": "operator* : std::add_lvalue_reference_t<element_type> () const noexcept"
},
{
"name": "operator->",
"qualified_name": "score::mw::com::SamplePtr::operator->",
"kind": "method",
"signature": "operator-> : pointer () const noexcept"
},
{
"name": "operator<",
"qualified_name": "score::mw::com::SamplePtr::operator<",
"kind": "method",
"signature": "operator< : bool (const SamplePtr<SampleType> &) const noexcept"
},
{
"name": "operator=",
"qualified_name": "score::mw::com::SamplePtr::operator=",
"kind": "method",
"signature": "operator= : SamplePtr<SampleType> &(std::nullptr_t) & noexcept"
"signature": "operator= : SamplePtr<SampleType> &(SamplePtr<SampleType> &&) & noexcept"
},
{
"name": "operator=",
"qualified_name": "score::mw::com::SamplePtr::operator=",
"kind": "method",
"signature": "operator= : SamplePtr<SampleType> &(SamplePtr<SampleType> &&) noexcept"
"signature": "operator= : SamplePtr<SampleType> &(std::nullptr_t) noexcept"
},
{
"name": "operator>",
"qualified_name": "score::mw::com::SamplePtr::operator>",
"kind": "method",
"signature": "operator> : bool (const SamplePtr<SampleType> &) const noexcept"
},
{
"name": "~SamplePtr<SampleType>",
Expand All @@ -544,10 +712,10 @@
"signature": "using SampleAllocateePtr = impl::SampleAllocateePtr<SampleType>"
},
{
"name": "GetReferencedSlot",
"qualified_name": "score::mw::com::SampleAllocateePtr::GetReferencedSlot",
"name": "Get",
"qualified_name": "score::mw::com::SampleAllocateePtr::Get",
"kind": "method",
"signature": "GetReferencedSlot : SlotIndexType () const noexcept"
"signature": "Get : pointer () const noexcept"
},
{
"name": "SampleAllocateePtr<SampleType>",
Expand All @@ -561,60 +729,48 @@
"kind": "constructor",
"signature": "SampleAllocateePtr<SampleType> : void (std::nullptr_t) noexcept"
},
{
"name": "SampleAllocateePtr<SampleType>",
"qualified_name": "score::mw::com::SampleAllocateePtr::SampleAllocateePtr<SampleType>",
"kind": "constructor",
"signature": "SampleAllocateePtr<SampleType> : void (pointer, const EventDataControlComposite<> &, ConsumerEventDataControlLocalView<> &, const SlotIndexType) noexcept"
},
{
"name": "SampleAllocateePtr<SampleType>",
"qualified_name": "score::mw::com::SampleAllocateePtr::SampleAllocateePtr<SampleType>",
"kind": "constructor",
"signature": "SampleAllocateePtr<SampleType> : void (SampleAllocateePtr<SampleType> &&) noexcept"
},
{
"name": "get",
"qualified_name": "score::mw::com::SampleAllocateePtr::get",
"name": "Swap",
"qualified_name": "score::mw::com::SampleAllocateePtr::Swap",
"kind": "method",
"signature": "get : pointer () const noexcept"
"signature": "Swap : void (SampleAllocateePtr<SampleType> &) noexcept"
},
{
"name": "operator*",
"qualified_name": "score::mw::com::SampleAllocateePtr::operator*",
"kind": "method",
"kind": "template_function",
"signature": "operator* : typename std::add_lvalue_reference<SampleType>::type () const noexcept"
},
{
"name": "operator->",
"qualified_name": "score::mw::com::SampleAllocateePtr::operator->",
"kind": "method",
"kind": "template_function",
"signature": "operator-> : pointer () const noexcept"
},
{
"name": "operator=",
"qualified_name": "score::mw::com::SampleAllocateePtr::operator=",
"kind": "method",
"signature": "operator= : SampleAllocateePtr<SampleType> &(std::nullptr_t) & noexcept"
"signature": "operator= : SampleAllocateePtr<SampleType> &(SampleAllocateePtr<SampleType> &&) & noexcept"
},
{
"name": "operator=",
"qualified_name": "score::mw::com::SampleAllocateePtr::operator=",
"kind": "method",
"signature": "operator= : SampleAllocateePtr<SampleType> &(SampleAllocateePtr<SampleType> &&) & noexcept"
"signature": "operator= : SampleAllocateePtr<SampleType> &(std::nullptr_t) noexcept"
},
{
"name": "reset",
"qualified_name": "score::mw::com::SampleAllocateePtr::reset",
"kind": "method",
"signature": "reset : void () noexcept"
},
{
"name": "swap",
"qualified_name": "score::mw::com::SampleAllocateePtr::swap",
"kind": "method",
"signature": "swap : void (SampleAllocateePtr<SampleType> &) noexcept"
},
{
"name": "~SampleAllocateePtr<SampleType>",
"qualified_name": "score::mw::com::SampleAllocateePtr::~SampleAllocateePtr<SampleType>",
Expand Down Expand Up @@ -685,7 +841,7 @@
"name": "GenericProxyEvent",
"qualified_name": "score::mw::com::GenericProxyEvent::GenericProxyEvent",
"kind": "constructor",
"signature": "GenericProxyEvent : void (ProxyBase &, const std::string_view, std::unique_ptr<GenericProxyEventBinding>)"
"signature": "GenericProxyEvent : void (const std::string_view, std::unique_ptr<GenericProxyEventBinding>)"
},
{
"name": "GenericProxyEvent",
Expand Down Expand Up @@ -721,7 +877,7 @@
"name": "ProxyEventBase",
"qualified_name": "score::mw::com::GenericProxyEvent::ProxyEventBase",
"kind": "constructor",
"signature": "ProxyEventBase : void (std::string_view, std::unique_ptr<ProxyEventBindingBase>) noexcept"
"signature": "ProxyEventBase : void (std::string_view, Result<std::unique_ptr<ProxyEventBindingBase>>) noexcept"
},
{
"name": "ProxyEventBase",
Expand Down
5 changes: 5 additions & 0 deletions score/mw/com/design/configuration/structural_view.puml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ package "configuration" {
+ GetServiceInstances() const noexcept : const ServiceInstanceDeployments&
+ GetGlobalConfiguration() const noexcept : const GlobalConfiguration&
+ GetTracingConfiguration() const noexcept : const TracingConfiguration&
+ MergeServiceEntries(const Configuration& additional_configuration) noexcept : Result<void>
}

class "score::mw::com::impl::LolaServiceTypeDeployment" {
Expand Down Expand Up @@ -199,16 +200,20 @@ class "nlhomann::json" {

class "score::mw::com::impl::Runtime" {
- configuration : Configuration const&
- configuration_mutex_ : std::mutex {mutable}
__
- Runtime(std::pair<Configuration&&, std::optional<tracing::TracingFilterConfig>&&> configs)
{static} + Initialize() : void
{static} + Initialize(const score::cpp::span<const score::StringLiteral> arguments) : void
{static} + InitializeRuntimeAddonConfiguration(const runtime::RuntimeConfiguration& runtime_configuration) : Result<void>
{static} + InitializeRuntimeAddonConfiguration(score::json::Any json) : Result<void>
{static} + getInstance() : Runtime&
+ resolve(const InstanceSpecifier&): score::mw::com::InstanceIdentifierContainer
+ GetBindingRuntime(const BindingType binding) const : IBindingRuntime*
+ GetServiceDiscovery() : IServiceDiscovery&
+ GetTracingFilterConfig() const : const tracing::ITracingFilterConfig*
+ GetTracingRuntime() const : tracing::ITracingRuntime*
- MergeAdditionalConfiguration(const Configuration& additional_configuration) : Result<void>
..
<u>Notes:</u>
AUTOSAR SWS talks about a Runtime singleton in chapter 7.1.2 Design decisions without directly requiring it!
Expand Down
Loading