Merge pull request #36 from robbr48/fetch_interface_sinks

Fetch interface feature should work for multiple connections and sinks
OpenModelica · Jan 9, 2018 · 495c0c7 · 495c0c7
2 parents 3104bb4 + 9def82c
commit 495c0c7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/common/Interfaces/TLMInterfaceSignal.cc b/common/Interfaces/TLMInterfaceSignal.cc
@@ -74,6 +74,8 @@ void TLMInterfaceSignal::GetTimeData(TLMTimeDataSignal& Instance, std::deque<TLM
         // We always assume no waves initially.
         Instance.Value = 0.0;
         Instance.time = TLMPlugin::TIME_WITHOUT_DATA;
+
+        if( Params.mode > 0.0 ) waitForShutdownFlg = true;
         return;
     }
 
@@ -128,6 +130,7 @@ void TLMInterfaceSignal::GetTimeData(TLMTimeDataSignal& Instance, std::deque<TLM
             }
         }
     }
+    if( Params.mode > 0.0 ) waitForShutdownFlg = true;
 }
 
 

diff --git a/common/Plugin/PluginImplementer.cc b/common/Plugin/PluginImplementer.cc
@@ -22,6 +22,17 @@ TLMPlugin* TLMPlugin::CreateInstance() {
     return PluginImplementerInstance;
 }
 
+void PluginImplementer::InterfaceReadyForTakedown(std::string IfcName) {
+    ++nIfcWaitingForTakedown;
+
+    TLMErrorLog::Debug("Interface "+IfcName+" is ready for takedown.");
+
+    if(nIfcWaitingForTakedown >= Interfaces.size()) {
+        AwaitClosePermission();
+        exit(0);
+    }
+}
+
 void PluginImplementer::AwaitClosePermission()
 {
   TLMErrorLog::Info("Awaiting close permission...");
@@ -337,6 +348,10 @@ void PluginImplementer::GetValueSignal(int interfaceID, double time, double *val
 
     // evaluate the reaction force from the TLM connection
     ifc->GetValue(time, value);
+
+    if(ifc->waitForShutdown()) {
+        InterfaceReadyForTakedown(ifc->GetName());
+    }
 }
 
 //This function is for backwards compatibility, remove when position variables has been removed from all wrappers
@@ -439,12 +454,7 @@ void PluginImplementer::SetMotion3D(int forceID,
         // needed anything ?
 #endif
 
-        TLMErrorLog::Info(string("Takedown due to finished interface data request."));
-
-        // If we got here, we have a shutdown request from all interfaces
-        //abort(); // Some systems don't handle exit() very well, let's try abort();
-        // abort creates core dump!
-        exit(0);
+        InterfaceReadyForTakedown(ifc->GetName());
     }
 }
 
@@ -479,12 +489,7 @@ void PluginImplementer::SetValueSignal(int valueID,
         // needed anything ?
 #endif
 
-        TLMErrorLog::Info(string("Takedown due to finished interface data request."));
-
-        // If we got here, we have a shutdown request from all interfaces
-        //abort(); // Some systems don't handle exit() very well, let's try abort();
-        // abort creates core dump!
-        exit(0);
+        InterfaceReadyForTakedown(ifc->GetName());
     }
 }
 
@@ -520,12 +525,7 @@ void PluginImplementer::SetMotion1D(int forceID,
         // needed anything ?
 #endif     
 
-        TLMErrorLog::Info(string("Takedown due to finished interface data request."));
-
-        // If we got here, we have a shutdown request from all interfaces
-        //abort(); // Some systems don't handle exit() very well, let's try abort();
-        // abort creates core dump!
-        exit(0);
+        InterfaceReadyForTakedown(ifc->GetName());
     }
 }
 

diff --git a/common/Plugin/PluginImplementer.h b/common/Plugin/PluginImplementer.h
@@ -83,6 +83,8 @@ class PluginImplementer: public TLMPlugin {
                        double maxStep,
                        std::string ServerName);
 
+    void InterfaceReadyForTakedown(std::string IfcName);
+
     void AwaitClosePermission();
 
     //! Register TLM interface sends a registration request to TLMManager
@@ -181,6 +183,8 @@ class PluginImplementer: public TLMPlugin {
     //! Maximum solver time step
     double MaxStep;
 
+    size_t nIfcWaitingForTakedown = 0;
+
 };
 
 #endif