lola: Preparation for moving TransactionLogLocalView

score/mw/com/design/shared_mem_layout/shared_mem_layout_classdiagram.puml

@@ -82,7 +82,7 @@ class "lola::EventControl" <<Shared Memory>> {
 class "lola::EventSubscriptionControl" <<Shared Memory>> <<typedef>> {
 }
 
-class "lola::detail_event_subscription_control::EventSubscriptionControlImpl<>" as EventSubscriptionControlImpl <<Shared Memory>> {
+class "lola::EventSubscriptionControl<>" as EventSubscriptionControl <<Shared Memory>> {
   -current_subscription_state_ : std::atomic_uint32_t
   -max_subscribable_slots_ : const SlotNumberType
   -max_subscribers_ : const SubscriberCountType
@@ -157,7 +157,7 @@ lola::EventControl *-- lola::EventSubscriptionControl
 lola::UidPidMapping *-- "0..n" lola::UidPidMappingEntry
 
 lola::EventDataControl .> EventDataControl : type
-lola::EventSubscriptionControl .> EventSubscriptionControlImpl : type
+lola::EventSubscriptionControl .> EventSubscriptionControl : type
 
 EventDataControl *-- lola::TransactionLogSet
 lola::TransactionLogSet *-- lola::TransactionLog

score/mw/com/impl/bindings/lola/BUILD

@@ -468,7 +468,7 @@ cc_library(
     ],
     deps = [
         ":proxy_event_data_control_local_view",
-        ":transaction_log_set",
+        ":transaction_log_index",
     ],
 )
 
@@ -516,7 +516,7 @@ cc_library(
     deps = [
         ":event_slot_status",
         ":proxy_event_data_control_local_view",
-        ":transaction_log_set",
+        ":transaction_log_index",
     ],
 )
 
@@ -790,6 +790,18 @@ cc_library(
     visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
 )
 
+cc_library(
+    name = "transaction_log_index",
+    srcs = ["transaction_log_index.cpp"],
+    hdrs = ["transaction_log_index.h"],
+    features = COMPILER_WARNING_FEATURES,
+    tags = ["FFI"],
+    visibility = ["//score/mw/com/impl/bindings/lola:__subpackages__"],
+    deps = [
+        "//score/mw/com/impl/configuration",
+    ],
+)
+
 cc_library(
     name = "transaction_log_set",
     srcs = ["transaction_log_set.cpp"],
@@ -804,6 +816,7 @@ cc_library(
     deps = [
         ":transaction_log",
         ":transaction_log_id",
+        ":transaction_log_index",
         "//score/mw/com/impl/configuration",
         "//score/mw/com/impl/util:copyable_atomic",
         "@score_baselibs//score/containers:dynamic_array",
@@ -844,6 +857,7 @@ cc_library(
         ":proxy_event_data_control_local_view",
         ":skeleton_event_data_control_local_view",
         ":transaction_log_id",
+        ":transaction_log_index",
         ":transaction_log_set",
         "@score_baselibs//score/result",
     ],
@@ -905,19 +919,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "event_data_control_test_resources",
-    testonly = True,
-    srcs = ["event_data_control_test_resources.cpp"],
-    hdrs = ["event_data_control_test_resources.h"],
-    features = COMPILER_WARNING_FEATURES,
-    visibility = ["//score/mw/com/impl:__subpackages__"],
-    deps = [
-        "//score/mw/com/impl/bindings/lola:event",
-        "@score_baselibs//score/language/futurecpp",
-    ],
-)
-
 cc_gtest_unit_test(
     name = "partial_restart_path_builder_test",
     srcs = ["partial_restart_path_builder_test.cpp"],
@@ -1333,7 +1334,6 @@ cc_gtest_unit_test(
     ],
     features = COMPILER_WARNING_FEATURES,
     deps = [
-        ":event_data_control_test_resources",
         "//score/mw/com/impl/bindings/lola/test:skeleton_event_test_resources",
     ],
 )
@@ -1345,7 +1345,6 @@ cc_gtest_unit_test(
     ],
     features = COMPILER_WARNING_FEATURES,
     deps = [
-        ":event_data_control_test_resources",
         "//score/mw/com/impl/bindings/lola/test:skeleton_event_test_resources",
         "//score/mw/com/impl/bindings/lola/test:transaction_log_test_resources",
         "//score/mw/com/impl/tracing/configuration:tracing_filter_config_mock",
@@ -1373,7 +1372,6 @@ cc_gtest_unit_test(
     ],
     features = COMPILER_WARNING_FEATURES,
     deps = [
-        ":event_data_control_test_resources",
         ":subscription_state_machine",
         "//score/mw/com/impl/bindings/lola/test:proxy_event_test_resources",
         "//score/mw/com/impl/bindings/lola/test:transaction_log_test_resources",
@@ -1419,11 +1417,15 @@ cc_gtest_unit_test(
     srcs = [
         "transaction_log_set_test.cpp",
     ],
-    features = COMPILER_WARNING_FEATURES,
+    features = COMPILER_WARNING_FEATURES + [
+        # These tests catch exceptions instead of using gtest EXPECT_DEATH so we disable aborts_upon_exception.
+        "-aborts_upon_exception",
+    ],
     deps = [
         "//score/mw/com/impl/bindings/lola:runtime_mock",
         "//score/mw/com/impl/bindings/lola/test:transaction_log_test_resources",
         "//score/mw/com/impl/test:runtime_mock_guard",
+        "@score_baselibs//score/language/futurecpp:futurecpp_test_support",
     ],
 )
 

score/mw/com/impl/bindings/lola/event_control.h

@@ -23,7 +23,7 @@ namespace score::mw::com::impl::lola
 class EventControl
 {
   public:
-    using SubscriberCountType = EventSubscriptionControl::SubscriberCountType;
+    using SubscriberCountType = EventSubscriptionControl<>::SubscriberCountType;
     EventControl(const SlotIndexType number_of_slots,
                  const SubscriberCountType max_subscribers,
                  const bool enforce_max_samples,
@@ -35,7 +35,7 @@ class EventControl
     // coverity[autosar_cpp14_m11_0_1_violation]
     EventDataControl data_control;
     // coverity[autosar_cpp14_m11_0_1_violation]
-    EventSubscriptionControl subscription_control;
+    EventSubscriptionControl<> subscription_control;
 };
 
 }  // namespace score::mw::com::impl::lola

score/mw/com/impl/bindings/lola/event_data_control_composite_test.cpp

@@ -130,12 +130,12 @@ class EventDataControlCompositeFixture : public ::testing::Test
     EventDataControlCompositeFixture& WithARegisteredTransactionLog()
     {
         SCORE_LANGUAGE_FUTURECPP_ASSERT(qm_ != nullptr);
-        transaction_log_index_qm_ = std::make_unique<TransactionLogSet::TransactionLogIndex>(
+        transaction_log_index_qm_ = std::make_unique<TransactionLogIndex>(
             skeleton_qm_local_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdQm).value());
 
         if (asil_ != nullptr)
         {
-            transaction_log_index_asil_ = std::make_unique<TransactionLogSet::TransactionLogIndex>(
+            transaction_log_index_asil_ = std::make_unique<TransactionLogIndex>(
                 skeleton_asil_local_->GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdAsil).value());
         }
         return *this;
@@ -179,8 +179,8 @@ class EventDataControlCompositeFixture : public ::testing::Test
     std::unique_ptr<memory::shared::AtomicMock<EventSlotStatus::value_type>> atomic_mock_{nullptr};
     std::unique_ptr<EventDataControlComposite<memory::shared::AtomicIndirectorMock>> unit_with_mock_atomics_{nullptr};
 
-    std::unique_ptr<TransactionLogSet::TransactionLogIndex> transaction_log_index_qm_{nullptr};
-    std::unique_ptr<TransactionLogSet::TransactionLogIndex> transaction_log_index_asil_{nullptr};
+    std::unique_ptr<TransactionLogIndex> transaction_log_index_qm_{nullptr};
+    std::unique_ptr<TransactionLogIndex> transaction_log_index_asil_{nullptr};
 };
 
 TEST_F(EventDataControlCompositeFixture, CanCreateAndDestroyFixture) {}
@@ -642,9 +642,9 @@ TEST(EventDataControlCompositeTest, DISABLED_fuzz)
         std::set<SlotIndexType> used_slots_asil{};
         EventSlotStatus::EventTimeStamp start_ts{1};
 
-        TransactionLogSet::TransactionLogIndex transaction_log_index_qm =
+        TransactionLogIndex transaction_log_index_qm =
             proxy_qm_local.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdQm).value();
-        TransactionLogSet::TransactionLogIndex transaction_log_index_asil =
+        TransactionLogIndex transaction_log_index_asil =
             proxy_asil_local.GetTransactionLogSet().RegisterProxyElement(kDummyTransactionLogIdAsil).value();
 
         for (auto counter = 0; counter < 100; counter++)