Skip to content

Get enable methods list from config file #322

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

Merged
bemerybmw merged 3 commits into from
Apr 29, 2026
Merged

Get enable methods list from config file #322

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
66b851e
Update config parser
muhseth Apr 8, 2026
390b561
Makes enable optional.
muhseth Apr 27, 2026
5bfa1db
Read enabled proxy methods from configuration
muhseth Apr 17, 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
42 changes: 22 additions & 20 deletions score/mw/com/impl/bindings/lola/proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "score/mw/com/impl/configuration/service_type_deployment.h"
#include "score/mw/com/impl/find_service_handle.h"
#include "score/mw/com/impl/handle_type.h"
#include "score/mw/com/impl/proxy_binding.h"
#include "score/mw/com/impl/runtime.h"
#include "score/mw/com/impl/service_element_type.h"

Expand Down Expand Up @@ -624,9 +625,9 @@ void Proxy::UnregisterEventBinding(const std::string_view service_element_name)
}
}

score::Result<void> Proxy::SetupMethods(const std::vector<std::string_view>& enabled_method_names)
score::Result<void> Proxy::SetupMethods()
{
auto enabled_method_data = GetMethodIdAndQueueSizeFromNames(enabled_method_names);
auto enabled_method_data = GetMethodIdAndQueueSizeForEnabledMethods();

// Add field Get/Set methods to the enabled method data.
// TODO(Ticket-250429): Replace these constants with actual per-field configuration flags
Expand Down Expand Up @@ -744,31 +745,32 @@ memory::shared::SharedMemoryFactory::UserPermissions Proxy::GetSkeletonShmPermis
}

std::vector<std::pair<UniqueMethodIdentifier, LolaMethodInstanceDeployment::QueueSize>>
Proxy::GetMethodIdAndQueueSizeFromNames(const std::vector<std::string_view>& enabled_method_names) const
Proxy::GetMethodIdAndQueueSizeForEnabledMethods() const
{
std::vector<std::pair<UniqueMethodIdentifier, LolaMethodInstanceDeployment::QueueSize>> method_data{};
std::transform(
enabled_method_names.cbegin(),
enabled_method_names.cend(),
std::back_inserter(method_data),
[this](const auto& method_name) -> std::pair<UniqueMethodIdentifier, LolaMethodInstanceDeployment::QueueSize> {
const std::string method_name_string{method_name};
const auto& lola_service_type_deployment = GetLoLaServiceTypeDeployment(handle_);
std::vector<std::pair<UniqueMethodIdentifier, LolaMethodInstanceDeployment::QueueSize>>
enabled_method_ids_and_queue_sizes{};
const auto& lola_service_instance_deployment = GetLoLaInstanceDeployment(handle_);
const auto& lola_service_type_deployment = GetLoLaServiceTypeDeployment(handle_);

// Get enabled methods from config and build method data
for (const auto& [method_name, method_deployment] : lola_service_instance_deployment.methods_)
{
if (method_deployment.enabled_.has_value() && method_deployment.enabled_.value())
{
const auto method_id =
GetServiceElementId<ServiceElementType::METHOD>(lola_service_type_deployment, method_name_string);
GetServiceElementId<ServiceElementType::METHOD>(lola_service_type_deployment, method_name);

const auto& lola_service_instance_deployment = GetLoLaInstanceDeployment(handle_);
const auto& method_instance_deployment = GetServiceElementInstanceDeployment<ServiceElementType::METHOD>(
lola_service_instance_deployment, method_name_string);
SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD_MESSAGE(
method_instance_deployment.queue_size_.has_value(),
method_deployment.queue_size_.has_value(),
"Method instance deployment must contain queue_size on proxy side!");
const auto queue_size = method_instance_deployment.queue_size_.value();
const auto queue_size = method_deployment.queue_size_.value();

return {{method_id, MethodType::kMethod}, queue_size};
});
enabled_method_ids_and_queue_sizes.emplace_back(UniqueMethodIdentifier{method_id, MethodType::kMethod},
queue_size);
}
}

return method_data;
return enabled_method_ids_and_queue_sizes;
}

std::size_t Proxy::CalculateRequiredShmSize(
Expand Down
4 changes: 2 additions & 2 deletions score/mw/com/impl/bindings/lola/proxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class Proxy : public ProxyBinding
/// been destructed.
void UnregisterEventBinding(const std::string_view service_element_name) noexcept override;

score::Result<void> SetupMethods(const std::vector<std::string_view>& enabled_method_names) override;
score::Result<void> SetupMethods() override;

QualityType GetQualityType() const noexcept;

Expand Down Expand Up @@ -210,7 +210,7 @@ class Proxy : public ProxyBinding

memory::shared::SharedMemoryFactory::UserPermissions GetSkeletonShmPermissions() const;
std::vector<std::pair<UniqueMethodIdentifier, LolaMethodInstanceDeployment::QueueSize>>
GetMethodIdAndQueueSizeFromNames(const std::vector<std::string_view>& enabled_method_names) const;
GetMethodIdAndQueueSizeForEnabledMethods() const;
std::vector<TypeErasedCallQueue::TypeErasedElementInfo> GetTypeErasedElementInfoForEnabledMethods(
const std::vector<std::pair<UniqueMethodIdentifier, LolaMethodInstanceDeployment::QueueSize>>&
enabled_method_data) const;
Expand Down
Loading