remove API for dynsteps, enable dyn steps by default, allo opt out by config

Signed-off-by: Marius Börschig <Marius.Boerschig@vector.com>

Author: MariusBgm

Demos/api/Orchestration/CMakeLists.txt

@@ -5,6 +5,5 @@
 make_silkit_demo(SilKitDemoAutonomous Autonomous.cpp OFF)
 make_silkit_demo(SilKitDemoCoordinated Coordinated.cpp OFF)
 make_silkit_demo(SilKitDemoSimStep SimStep.cpp OFF)
-make_silkit_demo(SilKitDemoDynSimStep DynSimStep.cpp OFF)
 make_silkit_demo(SilKitDemoSimStepAsync SimStepAsync.cpp OFF)
 

Demos/api/Orchestration/DynSimStep.cpp

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 
 #include <iostream>
-#include <thread>
 
 #include "silkit/SilKit.hpp"
 
@@ -39,18 +38,15 @@ int main(int argc, char** argv)
 
         auto* timeSyncService = lifecycleService->CreateTimeSyncService();
 
-        const auto stepSize = 5ms;
-
+        const auto stepSize = 1ms;
         timeSyncService->SetSimulationStepHandler(
-            [logger](std::chrono::nanoseconds now, std::chrono::nanoseconds duration) {
+            [logger](std::chrono::nanoseconds now, std::chrono::nanoseconds /*duration*/) {
             // The invocation of this handler marks the beginning of a simulation step.
-            {
-                std::stringstream ss;
-                ss << "--------- Simulation step T=" << now << ", duration=" << duration << " ---------";
-                logger->Info(ss.str());
-            }
 
-            std::this_thread::sleep_for(500ms);
+            std::stringstream ss;
+            ss << "--------- Simulation step T=" << now << " ---------";
+            logger->Info(ss.str());
+
             // All messages sent here are guaranteed to arrive at other participants before their next simulation step is called.
             // So here, we can rely on having received all messages from the past (< now).
             // Note that this guarantee only holds for messages sent within a simulation step,

Demos/api/Orchestration/SimStep.cpp

@@ -614,12 +614,6 @@ extern "C"
         return globalCapi->SilKit_TimeSyncService_Create(outTimeSyncService, lifecycleService);
     }
 
-    SilKit_ReturnCode SilKitCALL SilKit_TimeSyncService_Create_With_TimeAdvanceMode(SilKit_TimeSyncService** outTimeSyncService,
-                                                               SilKit_LifecycleService* lifecycleService, SilKit_TimeAdvanceMode timeAdvanceMode)
-    {
-        return globalCapi->SilKit_TimeSyncService_Create_With_TimeAdvanceMode(outTimeSyncService, lifecycleService, timeAdvanceMode);
-    }
-
     SilKit_ReturnCode SilKitCALL SilKit_TimeSyncService_SetSimulationStepHandler(
         SilKit_TimeSyncService* timeSyncService, void* context, SilKit_TimeSyncService_SimulationStepHandler_t handler,
         SilKit_NanosecondsTime initialStepSize)
@@ -647,12 +641,6 @@ extern "C"
         return globalCapi->SilKit_TimeSyncService_Now(timeSyncService, outNanosecondsTime);
     }
 
-    SilKit_ReturnCode SilKitCALL SilKit_TimeSyncService_SetStepDuration(SilKit_TimeSyncService* timeSyncService,
-                                                            SilKit_NanosecondsTime stepDuration)
-    {
-        return globalCapi->SilKit_TimeSyncService_SetStepDuration(timeSyncService, stepDuration);
-    }
-
     SilKit_ReturnCode SilKitCALL SilKit_Experimental_TimeSyncService_AddOtherSimulationStepsCompletedHandler(
         SilKit_TimeSyncService* timeSyncService, void* context,
         SilKit_Experimental_TimeSyncService_OtherSimulationStepsCompletedHandler_t handler,

SilKit/IntegrationTests/Hourglass/MockCapi.cpp

@@ -325,9 +325,6 @@ class MockCapi
     MOCK_METHOD(SilKit_ReturnCode, SilKit_TimeSyncService_Create,
                 (SilKit_TimeSyncService * *outTimeSyncService, SilKit_LifecycleService* lifecycleService));
 
-    MOCK_METHOD(SilKit_ReturnCode, SilKit_TimeSyncService_Create_With_TimeAdvanceMode,
-                (SilKit_TimeSyncService * *outTimeSyncService, SilKit_LifecycleService* lifecycleService, SilKit_TimeAdvanceMode timeAdvanceMode));
-
     MOCK_METHOD(SilKit_ReturnCode, SilKit_TimeSyncService_SetSimulationStepHandler,
                 (SilKit_TimeSyncService * timeSyncService, void* context,
                  SilKit_TimeSyncService_SimulationStepHandler_t handler, SilKit_NanosecondsTime initialStepSize));
@@ -342,9 +339,6 @@ class MockCapi
     MOCK_METHOD(SilKit_ReturnCode, SilKit_TimeSyncService_Now,
                 (SilKit_TimeSyncService * timeSyncService, SilKit_NanosecondsTime* outNanosecondsTime));
 
-    MOCK_METHOD(SilKit_ReturnCode, SilKit_TimeSyncService_SetStepDuration,
-                (SilKit_TimeSyncService * timeSyncService, SilKit_NanosecondsTime stepDuration));
-
     MOCK_METHOD(SilKit_ReturnCode, SilKit_Experimental_TimeSyncService_AddOtherSimulationStepsCompletedHandler,
                 (SilKit_TimeSyncService * timeSyncService, void* context,
                  SilKit_Experimental_TimeSyncService_OtherSimulationStepsCompletedHandler_t handler,

SilKit/IntegrationTests/Hourglass/MockCapi.hpp

@@ -148,8 +148,6 @@ class Test_HourglassOrchestration : public SilKitHourglassTests::MockCapiTest
             .WillByDefault(DoAll(SetArgPointee<0>(mockLifecycleService), Return(SilKit_ReturnCode_SUCCESS)));
         ON_CALL(capi, SilKit_TimeSyncService_Create(_, _))
             .WillByDefault(DoAll(SetArgPointee<0>(mockTimeSyncService), Return(SilKit_ReturnCode_SUCCESS)));
-        ON_CALL(capi, SilKit_TimeSyncService_Create_With_TimeAdvanceMode(_, _, _))
-            .WillByDefault(DoAll(SetArgPointee<0>(mockTimeSyncService), Return(SilKit_ReturnCode_SUCCESS)));
         ON_CALL(capi, SilKit_SystemMonitor_Create(_, _))
             .WillByDefault(DoAll(SetArgPointee<0>(mockSystemMonitor), Return(SilKit_ReturnCode_SUCCESS)));
         ON_CALL(capi, SilKit_Experimental_SystemController_Create(_, _))
@@ -364,23 +362,6 @@ TEST_F(Test_HourglassOrchestration, SilKit_TimeSyncService_Create)
         mockLifecycleService};
 }
 
-TEST_F(Test_HourglassOrchestration, SilKit_TimeSyncService_Create_With_TimeAdvanceMode)
-{
-    EXPECT_CALL(capi, SilKit_TimeSyncService_Create_With_TimeAdvanceMode(testing::_, mockLifecycleService,
-                                                                         SilKit_TimeAdvanceMode_ByMinimalDuration));
-
-    SilKit::DETAIL_SILKIT_DETAIL_NAMESPACE_NAME::Impl::Services::Orchestration::TimeSyncService
-        timeSyncService_ByMinimalDuration{
-        mockLifecycleService, SilKit::Services::Orchestration::TimeAdvanceMode::ByMinimalDuration};
-
-    EXPECT_CALL(capi, SilKit_TimeSyncService_Create_With_TimeAdvanceMode(testing::_, mockLifecycleService,
-                                                                         SilKit_TimeAdvanceMode_ByOwnDuration));
-
-    SilKit::DETAIL_SILKIT_DETAIL_NAMESPACE_NAME::Impl::Services::Orchestration::TimeSyncService
-        timeSyncService_ByOwnDuration{
-        mockLifecycleService, SilKit::Services::Orchestration::TimeAdvanceMode::ByOwnDuration};
-}
-
 TEST_F(Test_HourglassOrchestration, SilKit_TimeSyncService_SetSimulationStepHandler)
 {
     const std::chrono::nanoseconds initialStepSize{0x123456};
@@ -434,19 +415,6 @@ TEST_F(Test_HourglassOrchestration, SilKit_TimeSyncService_Now)
     EXPECT_EQ(timeSyncService.Now(), nanoseconds);
 }
 
-TEST_F(Test_HourglassOrchestration, SilKit_TimeSyncService_SetStepDuration)
-{
-    const std::chrono::nanoseconds stepDuration{0x123456};
-
-    SilKit::DETAIL_SILKIT_DETAIL_NAMESPACE_NAME::Impl::Services::Orchestration::TimeSyncService timeSyncService{
-        mockLifecycleService};
-
-    EXPECT_CALL(capi, SilKit_TimeSyncService_SetStepDuration(mockTimeSyncService, testing::_))
-            .WillOnce(Return(SilKit_ReturnCode_SUCCESS));
-
-    timeSyncService.SetStepDuration(stepDuration);
-}
-
 TEST_F(Test_HourglassOrchestration, SilKit_Experimental_TimeSyncService_AddOtherSimulationStepsCompletedHandler)
 {
     using testing::_;