diff --git a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp index 2ae44a9e6..7f878e6ef 100644 --- a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp +++ b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime.cpp @@ -290,12 +290,12 @@ analysis::tracing::ServiceInstanceElement TracingRuntime::ConvertToTracingServic if (service_element_type == impl::ServiceElementType::EVENT) { const auto lola_event_id = lola_service_type_deployment->events_.at(std::string{service_element_name}); - output_service_instance_element.element_id = static_cast(lola_event_id); + output_service_instance_element.element_id = ServiceInstanceElement::EventIdType{lola_event_id}; } else if (service_element_type == impl::ServiceElementType::FIELD) { const auto lola_field_id = lola_service_type_deployment->fields_.at(std::string{service_element_name}); - output_service_instance_element.element_id = static_cast(lola_field_id); + output_service_instance_element.element_id = ServiceInstanceElement::FieldIdType{lola_field_id}; } else { diff --git a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime_test.cpp b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime_test.cpp index 503621d25..429a31967 100644 --- a/score/mw/com/impl/bindings/lola/tracing/tracing_runtime_test.cpp +++ b/score/mw/com/impl/bindings/lola/tracing/tracing_runtime_test.cpp @@ -1035,13 +1035,13 @@ TEST_F(TracingRuntimeConvertToTracingServiceInstanceElementFixture, major_version_number_, minor_version_number_, static_cast(instance_id_), - static_cast(event_id_)}; + ServiceInstanceElement::EventIdType{event_id_}}; const ServiceInstanceElement expected_service_instance_element_field{ static_cast(service_id_), major_version_number_, minor_version_number_, static_cast(instance_id_), - static_cast(field_id_)}; + ServiceInstanceElement::FieldIdType{field_id_}}; // Given a TracingRuntimeObject with a provided configuration object TracingRuntime tracing_runtime{kNumberOfTotalConfiguredTracingSlots, configuration}; diff --git a/score/mw/com/impl/tracing/common_event_tracing.cpp b/score/mw/com/impl/tracing/common_event_tracing.cpp index 26a145299..4060968bb 100644 --- a/score/mw/com/impl/tracing/common_event_tracing.cpp +++ b/score/mw/com/impl/tracing/common_event_tracing.cpp @@ -46,7 +46,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element const TracingRuntime::TracePointType trace_point, const BindingType binding_type, const std::pair& local_data_chunk, - const score::cpp::optional trace_point_data_id) noexcept + const std::optional trace_point_data_id) noexcept { auto* const tracing_runtime = impl::Runtime::getInstance().GetTracingRuntime(); SCORE_LANGUAGE_FUTURECPP_ASSERT_PRD(tracing_runtime != nullptr); diff --git a/score/mw/com/impl/tracing/common_event_tracing.h b/score/mw/com/impl/tracing/common_event_tracing.h index 4f59bccd4..be3d3946c 100644 --- a/score/mw/com/impl/tracing/common_event_tracing.h +++ b/score/mw/com/impl/tracing/common_event_tracing.h @@ -39,7 +39,7 @@ ResultBlank TraceData(const ServiceElementInstanceIdentifierView service_element const TracingRuntime::TracePointType trace_point, const BindingType binding_type, const std::pair& local_data_chunk = {nullptr, 0U}, - const score::cpp::optional trace_point_data_id = {}) noexcept; + const std::optional trace_point_data_id = {}) noexcept; ResultBlank TraceShmData(const BindingType binding_type, const ServiceElementTracingData service_element_tracing_data, diff --git a/score/mw/com/impl/tracing/common_event_tracing_test.cpp b/score/mw/com/impl/tracing/common_event_tracing_test.cpp index 019289129..c2c64e6d9 100644 --- a/score/mw/com/impl/tracing/common_event_tracing_test.cpp +++ b/score/mw/com/impl/tracing/common_event_tracing_test.cpp @@ -119,7 +119,7 @@ TEST_F(CommonEventTracingLocalTraceDataFixture, CallingTraceDataWillDispatchToBi Trace(binding_type_, service_element_instance_identifier_view_, trace_point_, - score::cpp::optional{trace_point_data_id_}, + std::optional{trace_point_data_id_}, local_data_chunk_.first, local_data_chunk_.second)); diff --git a/score/mw/com/impl/tracing/i_tracing_runtime.h b/score/mw/com/impl/tracing/i_tracing_runtime.h index f06c8a8b8..e8a432cb9 100644 --- a/score/mw/com/impl/tracing/i_tracing_runtime.h +++ b/score/mw/com/impl/tracing/i_tracing_runtime.h @@ -72,7 +72,7 @@ class ITracingRuntime virtual ResultBlank Trace(const BindingType binding_type, const ServiceElementInstanceIdentifierView service_element_instance_identifier, const TracePointType trace_point_type, - const score::cpp::optional trace_point_data_id, + const std::optional trace_point_data_id, const void* const local_data_ptr, const std::size_t local_data_size) noexcept = 0; diff --git a/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp b/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp index 4bca132f6..f60c68d40 100644 --- a/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp +++ b/score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp @@ -469,7 +469,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture, SubscribeCallsAreTracedWhenEnabled Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, _, _)) .WillOnce(WithArgs<4, 5>( @@ -539,7 +539,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, _, _)) .WillOnce(WithArgs<4, 5>( @@ -617,7 +617,7 @@ TYPED_TEST(ProxyEventTracingSubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, _, _)) .WillOnce(WithArgs<4, 5>( @@ -733,7 +733,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture, UnsubscribeCallsAreTracedWhenEna Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(ResultBlank{})); @@ -794,7 +794,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -863,7 +863,7 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -969,7 +969,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture, SetReceiveHandlerCallsAreT Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(ResultBlank{})); @@ -1026,7 +1026,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1090,7 +1090,7 @@ TYPED_TEST(ProxyEventTracingSetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -1198,7 +1198,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture, ReceiveHandlerCallbac Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)); @@ -1266,7 +1266,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1342,7 +1342,7 @@ TYPED_TEST(ProxyEventTracingReceiveHandlerCallbackFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -1456,7 +1456,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture, UnsetReceiveHandlerCalls Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)); @@ -1515,7 +1515,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1582,7 +1582,7 @@ TYPED_TEST(ProxyEventTracingUnsetReceiveHandlerFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); @@ -1689,7 +1689,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture, GetNewSamplesCallsAreTracedWhe Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)); @@ -1743,7 +1743,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance))); @@ -1806,7 +1806,7 @@ TYPED_TEST(ProxyEventTracingGetNewSamplesFixture, Trace(BindingType::kLoLa, expected_service_element_instance_identifier_view, trace_point_type, - score::cpp::optional{}, + std::optional{}, nullptr, 0U)) .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints))); diff --git a/score/mw/com/impl/tracing/tracing_runtime.cpp b/score/mw/com/impl/tracing/tracing_runtime.cpp index 32b524645..f7cef3f09 100644 --- a/score/mw/com/impl/tracing/tracing_runtime.cpp +++ b/score/mw/com/impl/tracing/tracing_runtime.cpp @@ -172,7 +172,7 @@ analysis::tracing::TracePointType InternalToExternalTracePointType( analysis::tracing::AraComMetaInfo CreateMetaInfo( const ServiceElementInstanceIdentifierView& service_element_instance_identifier, const TracingRuntime::TracePointType& trace_point_type, - const score::cpp::optional trace_point_data_id, + const std::optional trace_point_data_id, const IBindingTracingRuntime& binding_runtime) noexcept { const analysis::tracing::TracePointType ext_trace_point_type = InternalToExternalTracePointType(trace_point_type); @@ -602,7 +602,7 @@ ResultBlank TracingRuntime::Trace(const BindingType binding_type, ResultBlank TracingRuntime::Trace(const BindingType binding_type, const ServiceElementInstanceIdentifierView service_element_instance_identifier, const TracePointType trace_point_type, - const score::cpp::optional trace_point_data_id, + const std::optional trace_point_data_id, const void* const local_data_ptr, const std::size_t local_data_size) noexcept { diff --git a/score/mw/com/impl/tracing/tracing_runtime.h b/score/mw/com/impl/tracing/tracing_runtime.h index d350e9b5b..63985af80 100644 --- a/score/mw/com/impl/tracing/tracing_runtime.h +++ b/score/mw/com/impl/tracing/tracing_runtime.h @@ -154,7 +154,7 @@ class TracingRuntime : public ITracingRuntime ResultBlank Trace(const BindingType binding_type, const ServiceElementInstanceIdentifierView service_element_instance_identifier, const TracePointType trace_point_type, - const score::cpp::optional trace_point_data_id, + const std::optional trace_point_data_id, const void* const local_data_ptr, const std::size_t local_data_size) noexcept override; diff --git a/score/mw/com/impl/tracing/tracing_runtime_mock.h b/score/mw/com/impl/tracing/tracing_runtime_mock.h index 89629bcdf..16b934a2a 100644 --- a/score/mw/com/impl/tracing/tracing_runtime_mock.h +++ b/score/mw/com/impl/tracing/tracing_runtime_mock.h @@ -49,7 +49,7 @@ class TracingRuntimeMock : public ITracingRuntime (BindingType, ServiceElementInstanceIdentifierView, TracePointType, - score::cpp::optional, + std::optional, const void*, std::size_t), (noexcept, override)); diff --git a/score/mw/com/impl/tracing/tracing_runtime_test.cpp b/score/mw/com/impl/tracing/tracing_runtime_test.cpp index befe3b750..a1046f4a0 100644 --- a/score/mw/com/impl/tracing/tracing_runtime_test.cpp +++ b/score/mw/com/impl/tracing/tracing_runtime_test.cpp @@ -163,7 +163,7 @@ TEST(TracingRuntime, TracingRuntimeTraceWillReceivePointerToConstShmData) score::mw::com::impl::tracing::TracingRuntime::*)(BindingType, ServiceElementInstanceIdentifierView, ITracingRuntime::TracePointType, - score::cpp::optional, + std::optional, ShmPointerType, std::size_t)>(&TracingRuntime::Trace); static_assert(std::is_member_function_pointer_v, diff --git a/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp b/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp index a3a5a769c..bc54a7ad4 100644 --- a/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp +++ b/score/mw/com/impl/tracing/tracing_runtime_trace_test.cpp @@ -52,9 +52,9 @@ constexpr std::string_view kInstanceSpecifier{"/my_service_type_port"}; const void* const kLocalDataPtr{reinterpret_cast(static_cast(500))}; constexpr std::size_t kLocalDataSize{8}; -const score::cpp::optional kEmptyDataId{}; +const std::optional kEmptyDataId{}; -const analysis::tracing::ServiceInstanceElement::EventIdType kServiceInstanceElementEventId = 42U; +const analysis::tracing::ServiceInstanceElement::EventIdType kServiceInstanceElementEventId{42U}; const analysis::tracing::ServiceInstanceElement::VariantType kServiceInstanceElementVariant{ kServiceInstanceElementEventId}; const analysis::tracing::ServiceInstanceElement kServiceInstanceElement{25, 1, 0, 1, kServiceInstanceElementVariant}; @@ -902,7 +902,7 @@ TEST_P(TracingRuntimeTraceLocalParamaterisedFixture, TraceLocalData_NonRecoverab analysis::tracing::LocalDataChunk root_chunk{kLocalDataPtr, kLocalDataSize}; analysis::tracing::LocalDataChunkList expected_chunk_list{root_chunk}; - analysis::tracing::ServiceInstanceElement::EventIdType event_id = 42U; + analysis::tracing::ServiceInstanceElement::EventIdType event_id{42U}; analysis::tracing::ServiceInstanceElement::VariantType variant{event_id}; analysis::tracing::ServiceInstanceElement service_instance_element{25, 1, 0, 1, variant}; @@ -958,7 +958,7 @@ TEST_P(TracingRuntimeTraceLocalParamaterisedFixture, DisabledTracing_EarlyReturn auto result1 = unit_under_test_->Trace(BindingType::kLoLa, dummy_service_element_instance_identifier_view_, trace_point_type_, - score::cpp::optional{}, + std::optional{}, reinterpret_cast(static_cast(500)), std::size_t{0}); EXPECT_FALSE(result1.has_value()); @@ -999,7 +999,7 @@ TEST_P(TracingRuntimeTraceLocalParamaterisedFixture, TraceLocalData_FatalError) analysis::tracing::LocalDataChunk root_chunk{kLocalDataPtr, kLocalDataSize}; analysis::tracing::LocalDataChunkList expected_chunk_list{root_chunk}; - analysis::tracing::ServiceInstanceElement::EventIdType event_id = 42U; + analysis::tracing::ServiceInstanceElement::EventIdType event_id{42U}; analysis::tracing::ServiceInstanceElement::VariantType variant{event_id}; analysis::tracing::ServiceInstanceElement service_instance_element{25, 1, 0, 1, variant}; @@ -1100,7 +1100,7 @@ TEST_P(TracingRuntimeShmMetaInfoFixture, ShmTraceCallMetaInfoContainsAraComMetaI EXPECT_CALL(*generic_trace_api_mock_.get(), Trace(trace_client_id_, _, _, trace_context_id_)) .WillOnce(WithArg<1>(Invoke([](const auto& meta_info) -> analysis::tracing::TraceResult { // Then the meta_info is set to the variant AraComMetaInfo - const auto* const ara_com_meta_info = score::cpp::get_if(&meta_info); + const auto* const ara_com_meta_info = std::get_if(&meta_info); EXPECT_NE(ara_com_meta_info, nullptr); return analysis::tracing::TraceResult{}; @@ -1138,7 +1138,7 @@ TEST_P(TracingRuntimeShmMetaInfoFixture, EXPECT_CALL(*generic_trace_api_mock_.get(), Trace(trace_client_id_, _, _, trace_context_id_)) .WillOnce( WithArg<1>(Invoke([&expected_trace_point_type](const auto& meta_info) -> analysis::tracing::TraceResult { - const auto* const ara_com_meta_info = score::cpp::get_if(&meta_info); + const auto* const ara_com_meta_info = std::get_if(&meta_info); EXPECT_NE(ara_com_meta_info, nullptr); // Then the meta_info properties contain the correct TracePointType and ServiceInstanceElement @@ -1178,7 +1178,7 @@ TEST_P(TracingRuntimeLocalMetaInfoFixture, LocalTraceCallMetaInfoContainsAraComM EXPECT_CALL(*generic_trace_api_mock_.get(), Trace(trace_client_id_, _, _)) .WillOnce(WithArg<1>(Invoke([](const auto& meta_info) -> analysis::tracing::TraceResult { // Then the meta_info is set to the variant AraComMetaInfo - const auto* const ara_com_meta_info = score::cpp::get_if(&meta_info); + const auto* const ara_com_meta_info = std::get_if(&meta_info); EXPECT_NE(ara_com_meta_info, nullptr); return analysis::tracing::TraceResult{}; @@ -1215,7 +1215,7 @@ TEST_P(TracingRuntimeLocalMetaInfoFixture, .WillOnce( WithArg<1>(Invoke([&expected_trace_point_type](const auto& meta_info) -> analysis::tracing::TraceResult { // Then the meta_info is set to the variant AraComMetaInfo - const auto* const ara_com_meta_info = score::cpp::get_if(&meta_info); + const auto* const ara_com_meta_info = std::get_if(&meta_info); EXPECT_NE(ara_com_meta_info, nullptr); // Then the meta_info properties contain the correct TracePointType and ServiceInstanceElement @@ -1275,7 +1275,7 @@ TEST_P(TracingRuntimeTraceDataLossFlagParameterisedFixture, CallingShmTraceWillT EXPECT_CALL(*generic_trace_api_mock_.get(), Trace(trace_client_id_, _, _, trace_context_id_)) .WillOnce(WithArg<1>(Invoke([data_loss_flag](const auto& meta_info) -> analysis::tracing::TraceResult { - const auto ara_com_meta_info = score::cpp::get(meta_info); + const auto ara_com_meta_info = std::get(meta_info); const auto transmitted_data_loss_value_bitset = ara_com_meta_info.trace_status; if (data_loss_flag) @@ -1323,7 +1323,7 @@ TEST_P(TracingRuntimeTraceDataLossFlagParameterisedFixture, CallingLocalTraceWil EXPECT_CALL(*generic_trace_api_mock_.get(), Trace(trace_client_id_, _, _)) .WillOnce(WithArg<1>(Invoke([data_loss_flag](const auto& meta_info) -> analysis::tracing::TraceResult { - const auto ara_com_meta_info = score::cpp::get(meta_info); + const auto ara_com_meta_info = std::get(meta_info); const auto transmitted_data_loss_value_bitset = ara_com_meta_info.trace_status; if (data_loss_flag)