Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 14 additions & 2 deletions score/mw/com/design/configuration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,13 @@ An example of such a mapping is shown here:
"eventId": 633
}
],
"fields": []
"fields": [],
"methods": [
{
"methodName": "SetPressure",
"methodId": 40
}
]
},
{
"binding": "SHM",
Expand All @@ -153,7 +159,13 @@ An example of such a mapping is shown here:
{
"instanceId": 1234,
"asil-level": "QM",
"binding": "SOME/IP"
"binding": "SOME/IP",
"methods": [
{
"methodName": "SetPressure",
"queueSize": 1
}
]
},
{
"instanceId": 62,
Expand Down
22 changes: 20 additions & 2 deletions score/mw/com/design/configuration/structural_view.puml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,25 @@ package "configuration" {
}

class "score::mw::com::impl::SomeIpServiceInstanceDeployment" {
+ instanceId: score::cpp::optional<std::uint16_t> const
+ ToString() const : std::string
+ instance_id_: score::cpp::optional<SomeIpServiceInstanceId>
+ events_ : std::unordered_map<std::string, SomeIpEventInstanceDeployment>
+ fields_ : std::unordered_map<std::string, SomeIpFieldInstanceDeployment>
+ methods_ : std::unordered_map<std::string, SomeIpMethodInstanceDeployment>
+ SomeIpServiceInstanceDeployment(instance_id : score::cpp::optional<SomeIpServiceInstanceId>, events : EventInstanceMapping, fields : FieldInstanceMapping, methods : MethodInstanceMapping)
+ Serialize() const : score::json::Object
}

class "score::mw::com::impl::SomeIpMethodInstanceDeployment" {
{static} + constexpr serializationVersion : std::uint8_t
+ queue_size_: std::optional<QueueSize>
__
+ SomeIpMethodInstanceDeployment(queue_size : std::optional<QueueSize>)
+ SomeIpMethodInstanceDeployment(json_object : const score::json::Object&)
{static} + CreateFromJson(json_object : const score::json::Object&) : SomeIpMethodInstanceDeployment
+ Serialize() const : score::json::Object
--
<u>Type Aliases:</u>
using QueueSize as std::uint8_t
}

class "score::mw::com::impl::LolaServiceInstanceDeployment" {
Expand Down Expand Up @@ -228,6 +245,7 @@ class "score::mw::com::impl::Runtime" {
"score::mw::com::impl::LolaServiceInstanceDeployment" *-- "score::mw::com::impl::LolaEventInstanceDeployment" : 0..1
"score::mw::com::impl::LolaServiceInstanceDeployment" *-- "score::mw::com::impl::LolaFieldInstanceDeployment" : 0..1
"score::mw::com::impl::LolaServiceInstanceDeployment" *-- "score::mw::com::impl::LolaMethodInstanceDeployment" : 0..1
"score::mw::com::impl::SomeIpServiceInstanceDeployment" *-- "score::mw::com::impl::SomeIpMethodInstanceDeployment" : 0..1
"score::mw::com::impl::Configuration" *-- "score::mw::com::ServiceIdentifierType"
"score::mw::com::impl::Configuration" *-- "score::mw::com::impl::ServiceInstanceDeployment"
"score::mw::com::impl::Configuration" *-- "GlobalConfiguration"
Expand Down
61 changes: 61 additions & 0 deletions score/mw/com/impl/configuration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ cc_library(
":lola_service_instance_deployment",
":quality_type",
":service_type_deployment",
":someip_method_instance_deployment",
":someip_service_instance_deployment",
"@score_logging//score/mw/log",
],
Expand Down Expand Up @@ -195,6 +196,39 @@ cc_library(
tags = ["FFI"],
)

cc_library(
name = "someip_event_id",
srcs = ["someip_event_id.cpp"],
hdrs = ["someip_event_id.h"],
features = COMPILER_WARNING_FEATURES,
tags = ["FFI"],
)

cc_library(
name = "someip_field_id",
srcs = ["someip_field_id.cpp"],
hdrs = ["someip_field_id.h"],
features = COMPILER_WARNING_FEATURES,
tags = ["FFI"],
deps = [":someip_event_id"],
)

cc_library(
name = "someip_method_id",
srcs = ["someip_method_id.cpp"],
hdrs = ["someip_method_id.h"],
features = COMPILER_WARNING_FEATURES,
tags = ["FFI"],
)

cc_library(
name = "someip_service_id",
srcs = ["someip_service_id.cpp"],
hdrs = ["someip_service_id.h"],
features = COMPILER_WARNING_FEATURES,
tags = ["FFI"],
)

cc_library(
name = "lola_field_instance_deployment",
srcs = ["lola_field_instance_deployment.cpp"],
Expand Down Expand Up @@ -222,6 +256,15 @@ cc_library(
deps = ["@score_baselibs//score/json"],
)

cc_library(
name = "someip_method_instance_deployment",
srcs = ["someip_method_instance_deployment.cpp"],
hdrs = ["someip_method_instance_deployment.h"],
features = COMPILER_WARNING_FEATURES,
tags = ["FFI"],
deps = ["@score_baselibs//score/json"],
)

cc_library(
name = "lola_service_instance_deployment",
srcs = ["lola_service_instance_deployment.cpp"],
Expand Down Expand Up @@ -257,6 +300,21 @@ cc_library(
],
)

cc_library(
name = "someip_service_type_deployment",
srcs = ["someip_service_type_deployment.cpp"],
hdrs = ["someip_service_type_deployment.h"],
features = COMPILER_WARNING_FEATURES,
tags = ["FFI"],
deps = [
":binding_service_type_deployment",
":someip_event_id",
":someip_field_id",
":someip_method_id",
":someip_service_id",
],
)

cc_library(
name = "lola_service_instance_id",
srcs = ["lola_service_instance_id.cpp"],
Expand Down Expand Up @@ -336,6 +394,7 @@ cc_library(
deps = [
":configuration_common_resources",
":lola_service_type_deployment",
":someip_service_type_deployment",
"@score_baselibs//score/json",
"@score_baselibs//score/language/futurecpp",
],
Expand Down Expand Up @@ -364,6 +423,7 @@ cc_library(
":configuration_common_resources",
":someip_event_instance_deployment",
":someip_field_instance_deployment",
":someip_method_instance_deployment",
":someip_service_instance_id",
"@score_baselibs//score/json",
"@score_baselibs//score/language/futurecpp",
Expand Down Expand Up @@ -429,6 +489,7 @@ cc_library(
":service_type_deployment",
":service_version_type",
":shm_size_calc_mode",
":someip_method_instance_deployment",
":someip_service_instance_deployment",
],
)
Expand Down
7 changes: 5 additions & 2 deletions score/mw/com/impl/configuration/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,9 @@ support cross-ECU communication.
However, the `service-type` on which the `service-instance` is based on, needs to support the technical transport
mechanism (`binding`) and needs to configure the instance `independent` parts of the binding.

Currently, the only supported binding is the shared-memory binding, which is represented as `SHM` in the json.
The other binding `SOME/IP`, which the schema allows, is only a placeholder right now.
Currently, the fully functional end-to-end binding is the shared-memory binding, which is represented as `SHM` in the json.
The `SOME/IP` binding configuration layer (schema, parsing, and deployment classes) is also implemented and supported in the json.
However, the `SOME/IP` transport layer implementation is still pending.
In the corresponding snippet from our example configuration:

"bindings": [
Expand Down Expand Up @@ -593,3 +594,5 @@ is being used, whether a property is mandatory or optional or irrelevant, the fo
| _serviceInstances.instances.events.maxSubscribers_ <br> _serviceInstances.instances.fields.maxSubscribers_ | required | - | |
| _serviceInstances.instances.events.enforceMaxSamples_ <br> _serviceInstances.instances.fields.enforceMaxSamples_ | optional | - | if not given on skeleton side, defaults to true |
| _serviceInstances.instances.events.numberOfIpcTracingSlots_ <br> _serviceInstances.instances.fields.numberOfIpcTracingSlots_ | optional | - | if not given on skeleton side, defaults to 0, which means tracing for this event is disabled. |
| _serviceInstances.instances.methods.methodName_ | required | required | |
| _serviceInstances.instances.methods.queueSize_ | optional | - | if not given on skeleton side, defaults to 1. Currently only queue sizes of 1 are supported. |
Loading