SKA-1007: RPC calling order (#194)

Author: KyllianAubry

FmuImporter/FmuImporter/FmuImporter.cs

@@ -595,13 +595,29 @@ private void RecordClocksAndClockedVariables()
     // retrieve and send CAN frames
     var outputCan = FmuCanManager.GetCanData();
     SilKitCanManager.SendAllFrames(outputCan);
+
+    // retrieve RPC server results from the FMU and submit them
+    var rpcServerResults = FmuRpcServerManager.GetOperations();
+    SilKitRpcServerManager.SubmitResult(rpcServerResults);
+
+    // retrieve RPC client calls from the FMU and send them
+    var rpcClientCalls = FmuRpcClientManager.GetOperations();
+    SilKitRpcClientManager.Call(rpcClientCalls);
   }
 
   private void ApplyClocksAndClockedInputs()
   {
     // handle received CAN frames
     var receivedSilKitCanData = SilKitCanManager.RetrieveReceivedCanData(_lastSimStep!.Value);
     FmuCanManager.SetCanData(receivedSilKitCanData);
+
+    // handle client RPC results
+    var recvRpcResults = SilKitRpcClientManager.RetrieveReceivedRpcEvents(_lastSimStep!.Value);
+    FmuRpcClientManager.SetData(recvRpcResults);
+
+    // handle server RPC calls
+    var recvRpcCalls = SilKitRpcServerManager.RetrieveReceivedRpcCalls(_lastSimStep!.Value);
+    FmuRpcServerManager.SetData(recvRpcCalls);
   }
 
   public void StartSimulation()
@@ -735,6 +751,8 @@ private void OnSimulationStep(ulong nowInNs, ulong durationInNs)
 
           FmuEntity.UpdateDiscreteStates(out discreteStatesNeedUpdate, out terminateRequested);
 
+          RecordClocksAndClockedVariables();
+
           if (terminateRequested)
           {
             SilKitCanManager.StopCanControllers();
@@ -743,8 +761,6 @@ private void OnSimulationStep(ulong nowInNs, ulong durationInNs)
             return;
           }
 
-          RecordClocksAndClockedVariables();
-
         } while (discreteStatesNeedUpdate);
 
         FmuEntity.EnterStepMode();
@@ -769,14 +785,6 @@ private void OnSimulationStep(ulong nowInNs, ulong durationInNs)
     FmuDataManager.SetData(receivedSilKitDataStruct);
     FmuDataManager.SetData(receivedSilKitDataClockedStruct);
 
-    // handle client RPC results
-    var receivedRpcResults = SilKitRpcClientManager.RetrieveReceivedRpcEvents(_lastSimStep!.Value);
-    FmuRpcClientManager.SetData(receivedRpcResults);
-
-    // handle server RPC calls
-    var receivedRpcCalls = SilKitRpcServerManager.RetrieveReceivedRpcCalls(_lastSimStep!.Value);
-    FmuRpcServerManager.SetData(receivedRpcCalls);
-
     _lastSimStep = nowInNs;
 
     if (_initialSimTime > 0)
@@ -845,14 +853,6 @@ private void OnSimulationStep(ulong nowInNs, ulong durationInNs)
         FmuDataManager.SetData(receivedSilKitDataStructEventMode);
         FmuDataManager.SetData(receivedSilKitDataClockedStructEventMode);
 
-        // handle client RPC results
-        var recvRpcResults = SilKitRpcClientManager.RetrieveReceivedRpcEvents(_lastSimStep!.Value);
-        FmuRpcClientManager.SetData(recvRpcResults);
-
-        // handle server RPC calls
-        var recvRpcCalls = SilKitRpcServerManager.RetrieveReceivedRpcCalls(_lastSimStep!.Value);
-        FmuRpcServerManager.SetData(recvRpcCalls);
-
         do
         {
           ApplyClocksAndClockedInputs();
@@ -869,12 +869,6 @@ private void OnSimulationStep(ulong nowInNs, ulong durationInNs)
             return;
           }
 
-          var rpcCalls = FmuRpcServerManager.GetOperations();
-          SilKitRpcServerManager.SubmitResult(rpcCalls);
-
-          var futureRpcCalls = FmuRpcClientManager.GetOperations();
-          SilKitRpcClientManager.Call(futureRpcCalls);
-
         } while (discreteStatesNeedUpdate);
 
         // Retrieve and publish non-structured variables