Switch from ESTD to ETL

Author: rolandreichweinbmw

executables/referenceApp/application/CMakeLists.txt

@@ -44,7 +44,7 @@ target_link_libraries(
             asyncConsole
             bspMcu
             configuration
-            estd
+            etl
             lifecycle
             consoleCommands
             logger

executables/referenceApp/application/include/systems/DoCanSystem.h

@@ -14,6 +14,7 @@
 #include <docan/datalink/DoCanFrameCodec.h>
 #include <docan/transmitter/IDoCanTickGenerator.h>
 #include <docan/transport/DoCanTransportLayerContainer.h>
+#include <etl/vector.h>
 #include <lifecycle/AsyncLifecycleComponent.h>
 
 namespace can
@@ -101,7 +102,7 @@ class DoCanSystem final
     ::docan::DoCanParameters _parameters;
     ::docan::declare::DoCanTransportLayerConfig<DataLinkLayerType, 80U, 15U, 64U>
         _transportLayerConfig;
-    ::estd::declare::vector<DoCanPhysicalCanTransceiver<AddressingType>, NUM_CAN_TRANSPORT_LAYERS>
+    ::etl::vector<DoCanPhysicalCanTransceiver<AddressingType>, NUM_CAN_TRANSPORT_LAYERS>
         _physicalTransceivers;
     TransportLayers _transportLayers;
     TickGeneratorRunnableAdapter _tickGenerator;

executables/referenceApp/application/include/systems/TransportSystem.h

@@ -3,19 +3,18 @@
 #ifndef GUARD_FACE7DDD_046B_4B7B_B83F_6212136CBA2E
 #define GUARD_FACE7DDD_046B_4B7B_B83F_6212136CBA2E
 
+#include <etl/singleton_base.h>
 #include <lifecycle/AsyncLifecycleComponent.h>
 #include <transport/ITransportMessageProvider.h>
 #include <transport/ITransportSystem.h>
 #include <transport/routing/TransportRouterSimple.h>
 
-#include <estd/singleton.h>
-
 namespace transport
 {
 class AbstractTransportLayer;
 
 class TransportSystem
-: public ::estd::singleton<TransportSystem>
+: public ::etl::singleton_base<TransportSystem>
 , public ::transport::ITransportSystem
 , public ::lifecycle::AsyncLifecycleComponent
 {

executables/referenceApp/application/include/systems/UdsSystem.h

@@ -5,6 +5,7 @@
 
 #include <async/Async.h>
 #include <async/IRunnable.h>
+#include <etl/singleton_base.h>
 #include <lifecycle/AsyncLifecycleComponent.h>
 #include <uds/DiagDispatcher.h>
 #include <uds/DummySessionPersistence.h>
@@ -23,8 +24,6 @@
 #include <uds/services/testerpresent/TesterPresent.h>
 #include <uds/services/writedata/WriteDataByIdentifier.h>
 
-#include <estd/singleton.h>
-
 namespace lifecycle
 {
 class LifecycleManager;
@@ -39,11 +38,9 @@ namespace uds
 {
 class UdsSystem
 : public lifecycle::AsyncLifecycleComponent
-, public ::estd::singleton<UdsSystem>
+, public ::etl::singleton_base<UdsSystem>
 , private ::async::IRunnable
 {
-    using Base = ::estd::singleton<UdsSystem>;
-
 public:
     UdsSystem(
         lifecycle::LifecycleManager& lManager,

executables/referenceApp/application/include/uds/ReadIdentifierPot.h

@@ -3,18 +3,13 @@
 #ifndef GUARD_DC726F41_1EE2_4343_818F_8A2F855AB88F
 #define GUARD_DC726F41_1EE2_4343_818F_8A2F855AB88F
 
-#include "estd/array.h"
-#include "estd/slice.h"
-#include "estd/uncopyable.h"
 #include "platform/estdint.h"
 #include "uds/jobs/DataIdentifierJob.h"
 
 namespace uds
 {
 class ReadIdentifierPot : public DataIdentifierJob
 {
-    UNCOPYABLE(ReadIdentifierPot);
-
 public:
     ReadIdentifierPot(DiagSessionMask const sessionMask = DiagSession::ALL_SESSIONS());
 

executables/referenceApp/application/src/app/app.cpp

@@ -3,7 +3,6 @@
 #include "app/app.h"
 
 #include "console/console.h"
-#include "estd/typed_mem.h"
 #include "logger/logger.h"
 #include "reset/softwareSystemReset.h"
 #include "systems/DemoSystem.h"
@@ -12,6 +11,8 @@
 #include "systems/SysAdminSystem.h"
 
 #include <app/appConfig.h>
+#include <etl/alignment.h>
+#include <etl/singleton.h>
 
 #ifdef PLATFORM_SUPPORT_UDS
 #include "busid/BusId.h"
@@ -27,6 +28,8 @@
 #include <lifecycle/LifecycleLogger.h>
 #include <lifecycle/LifecycleManager.h>
 
+#include <cstdio>
+
 #ifdef PLATFORM_SUPPORT_CAN
 #include <systems/ICanSystem.h>
 
@@ -70,21 +73,21 @@ LifecycleManager lifecycleManager{
     TASK_SYSADMIN,
     ::lifecycle::LifecycleManager::GetTimestampType::create<&getSystemTimeUs32Bit>()};
 
-::estd::typed_mem<::systems::RuntimeSystem> runtimeSystem;
-::estd::typed_mem<::systems::SysAdminSystem> sysAdminSystem;
-::estd::typed_mem<::systems::DemoSystem> demoSystem;
-::estd::typed_mem<::systems::SafetySystem> safetySystem;
+::etl::typed_storage<::systems::RuntimeSystem> runtimeSystem;
+::etl::typed_storage<::systems::SysAdminSystem> sysAdminSystem;
+::etl::typed_storage<::systems::DemoSystem> demoSystem;
+::etl::typed_storage<::systems::SafetySystem> safetySystem;
 
 #ifdef PLATFORM_SUPPORT_UDS
-::estd::typed_mem<::transport::TransportSystem> transportSystem;
+::etl::typed_storage<::transport::TransportSystem> transportSystem;
 #endif
 
 #ifdef PLATFORM_SUPPORT_CAN
-::estd::typed_mem<::docan::DoCanSystem> doCanSystem;
+::etl::typed_storage<::docan::DoCanSystem> doCanSystem;
 #endif
 
 #ifdef PLATFORM_SUPPORT_UDS
-::estd::typed_mem<::uds::UdsSystem> udsSystem;
+::etl::typed_storage<::uds::UdsSystem> udsSystem;
 #endif
 
 class LifecycleMonitor : private ::lifecycle::ILifecycleListener
@@ -136,39 +139,37 @@ void run()
     /* runlevel 1 */
     ::platform::platformLifecycleAdd(lifecycleManager, 1U);
     lifecycleManager.addComponent(
-        "runtime", runtimeSystem.emplace(TASK_BACKGROUND, runtimeMonitor), 1U);
+        "runtime", runtimeSystem.create(TASK_BACKGROUND, runtimeMonitor), 1U);
     /* runlevel 2 */
     ::platform::platformLifecycleAdd(lifecycleManager, 2U);
     /* runlevel 3 */
     ::platform::platformLifecycleAdd(lifecycleManager, 3U);
     /* runlevel 4 */
 #ifdef PLATFORM_SUPPORT_UDS
-    lifecycleManager.addComponent("transport", transportSystem.emplace(TASK_UDS), 4U);
+    lifecycleManager.addComponent("transport", transportSystem.create(TASK_UDS), 4U);
 #endif
 
     /* runlevel 5 */
 #ifdef PLATFORM_SUPPORT_CAN
     lifecycleManager.addComponent(
-        "docan", doCanSystem.emplace(*transportSystem, ::systems::getCanSystem(), TASK_CAN), 5U);
+        "docan", doCanSystem.create(*transportSystem, ::systems::getCanSystem(), TASK_CAN), 5U);
 #endif
 
     /* runlevel 6 */
 #ifdef PLATFORM_SUPPORT_UDS
     lifecycleManager.addComponent(
-        "uds",
-        udsSystem.emplace(lifecycleManager, *transportSystem, TASK_UDS, LOGICAL_ADDRESS),
-        6U);
+        "uds", udsSystem.create(lifecycleManager, *transportSystem, TASK_UDS, LOGICAL_ADDRESS), 6U);
 #endif
 
     /* runlevel 7 */
     lifecycleManager.addComponent(
-        "sysadmin", sysAdminSystem.emplace(TASK_SYSADMIN, lifecycleManager), 7U);
+        "sysadmin", sysAdminSystem.create(TASK_SYSADMIN, lifecycleManager), 7U);
 
     /* runlevel 8 */
     ::platform::platformLifecycleAdd(lifecycleManager, 8U);
     lifecycleManager.addComponent(
         "demo",
-        demoSystem.emplace(
+        demoSystem.create(
             TASK_DEMO,
             lifecycleManager
 #ifdef PLATFORM_SUPPORT_CAN
@@ -178,8 +179,7 @@ void run()
                 ),
         8U);
 
-    lifecycleManager.addComponent(
-        "safety", safetySystem.emplace(TASK_SAFETY, lifecycleManager), 8U);
+    lifecycleManager.addComponent("safety", safetySystem.create(TASK_SAFETY, lifecycleManager), 8U);
 
     lifecycleManager.transitionToLevel(MaxNumLevels);
 

executables/referenceApp/application/src/systems/DemoSystem.cpp

@@ -11,8 +11,7 @@
 #include "app/DemoLogger.h"
 
 #include <bsp/SystemTime.h>
-
-#include <estd/big_endian.h>
+#include <etl/unaligned_type.h>
 #ifdef PLATFORM_SUPPORT_CAN
 #include <can/transceiver/AbstractCANTransceiver.h>
 #endif
@@ -118,9 +117,8 @@ void DemoSystem::cyclic()
         if (canTransceiver != nullptr)
         {
             // Logger::debug(DEMO, "Sending frame %d", canSentCount);
-            uint8_t canData[4] = {0};
-            ::estd::write_be(canData, canSentCount);
-            ::can::CANFrame frame(0x558, canData, 4);
+            etl::be_uint32_t canData{canSentCount};
+            ::can::CANFrame frame(0x558, static_cast<uint8_t*>(canData.data()), 4);
             canTransceiver->write(frame);
             ++canSentCount;
         }

executables/referenceApp/application/src/systems/DoCanSystem.cpp

@@ -9,6 +9,8 @@
 #include <bsp/timer/SystemTimer.h>
 #include <docan/common/DoCanLogger.h>
 #include <docan/datalink/DoCanFrameCodecConfigPresets.h>
+#include <etl/delegate.h>
+#include <etl/span.h>
 
 namespace
 {
@@ -46,7 +48,7 @@ DoCanSystem::DoCanSystem(
 , _classicCodec(::docan::DoCanFrameCodecConfigPresets::PADDED_CLASSIC, _frameSizeMapper)
 , _classicAddressingFilter()
 , _parameters(
-      ::estd::function<decltype(systemUs)>::create<&systemUs>(),
+      ::etl::delegate<decltype(systemUs)>::create<&systemUs>(),
       ALLOCATE_TIMEOUT,
       RX_TIMEOUT,
       TX_CALLBACK_TIMEOUT,
@@ -72,25 +74,25 @@ void DoCanSystem::initLayer()
     auto& transceiver = *_canSystem.getCanTransceiver(::busid::CAN_0);
 
     ::docan::DoCanPhysicalCanTransceiver<AddressingType>& doCanTransceiver
-        = _physicalTransceivers.emplace_back().construct(
-            ::estd::by_ref(transceiver),
-            ::estd::by_ref(_classicAddressingFilter),
-            ::estd::by_ref(_classicAddressingFilter),
-            ::estd::by_ref(_addressing));
+        = _physicalTransceivers.emplace_back(
+            ::etl::ref(transceiver),
+            ::etl::ref(_classicAddressingFilter),
+            ::etl::ref(_classicAddressingFilter),
+            ::etl::ref(_addressing));
 
-    _transportLayers.createTransportLayer().construct(
+    _transportLayers.emplace_back(
         ::busid::CAN_0,
-        ::estd::by_ref(_context),
-        ::estd::by_ref(_classicAddressingFilter),
-        ::estd::by_ref(doCanTransceiver),
-        ::estd::by_ref(_tickGenerator),
-        ::estd::by_ref(_transportLayerConfig),
+        ::etl::ref(_context),
+        ::etl::ref(_classicAddressingFilter),
+        ::etl::ref(doCanTransceiver),
+        ::etl::ref(_tickGenerator),
+        ::etl::ref(_transportLayerConfig),
         ::util::logger::DOCAN);
 }
 
 void DoCanSystem::init()
 {
-    _classicAddressingFilter.init(::estd::make_slice(_addresses), ::estd::make_slice(_codecs));
+    _classicAddressingFilter.init(::etl::make_span(_addresses), ::etl::make_span(_codecs));
 
     initLayer();
 

executables/referenceApp/application/src/systems/TransportSystem.cpp

@@ -9,7 +9,7 @@
 namespace transport
 {
 TransportSystem::TransportSystem(::async::ContextType transitionContext)
-: ::estd::singleton<TransportSystem>(*this)
+: ::etl::singleton_base<TransportSystem>(*this)
 {
     // Tell the lifecycle manager in which context to execute init/run/shutdown
     setTransitionContext(transitionContext);

executables/referenceApp/application/src/systems/UdsSystem.cpp

@@ -9,8 +9,6 @@
 
 #include <uds/UdsLogger.h>
 
-#include <estd/type_traits.h>
-
 namespace uds
 {
 using ::util::logger::Logger;
@@ -26,7 +24,7 @@ UdsSystem::UdsSystem(
     ::async::ContextType context,
     uint16_t udsAddress)
 : AsyncLifecycleComponent()
-, ::estd::singleton<UdsSystem>(*this)
+, ::etl::singleton_base<UdsSystem>(*this)
 , _udsLifecycleConnector(lManager)
 , _transportSystem(transportSystem)
 , _jobRoot()