Add log levels for TLMErrorLog class.

OpenModelica · Dec 12, 2017 · 647546c · 647546c
1 parent 0f704bf
commit 647546c
Show file tree

Hide file tree

Showing 33 changed files with 413 additions and 410 deletions.
diff --git a/ADAMS/tlmforce.cc b/ADAMS/tlmforce.cc
@@ -128,7 +128,7 @@ TLM_force::~TLM_force() {
 }
 
 void TLM_force::SetDebugOut(){
-    Plugin->SetDebugOut(true);
+    TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
 }
 
 TLM_force* TLM_force::GetInstance(bool debugFlg)

diff --git a/FMIWrapper/main.cpp b/FMIWrapper/main.cpp
diff --git a/Hopsan/TLMPluginLib/TLMPluginHandler.hpp b/Hopsan/TLMPluginLib/TLMPluginHandler.hpp
@@ -84,7 +84,10 @@ namespace hopsan {
                     TLMErrorLog::SetOutStream(mDebugOutFile);
                 }
 
-                TLMErrorLog::SetDebugOut(true);
+                TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
+            }
+            else {
+                TLMErrorLog::SetLogLevel(TLMLogLevel::Warning);
             }
 
             //Register parameters
@@ -95,11 +98,11 @@ namespace hopsan {
             {
                 HString parValue;
                 mpSystemParent->getParameterValue(parNames[i],parValue);
-                TLMErrorLog::Log("Registers parameter: "+h2s(parNames[i]));
+                TLMErrorLog::Info("Registers parameter: "+h2s(parNames[i]));
                 mParIds.push_back(mpPlugin->RegisterComponentParameter(h2s(parNames[i]),h2s(parValue)));
                 std::stringstream ss;
                 ss << "Hopsan got parameter ID: " << mParIds[mParIds.size()-1];
-                TLMErrorLog::Log(ss.str());
+                TLMErrorLog::Info(ss.str());
             }
 
             //Receive parameter values
@@ -108,11 +111,11 @@ namespace hopsan {
                 std::string name, value;
                 std::stringstream ss;
                 ss << "Requesting value for parameter " << mParIds[i];
-                TLMErrorLog::Log(ss.str());
+                TLMErrorLog::Info(ss.str());
                 mpPlugin->GetParameterValue(mParIds[i], name, value);
                 std::stringstream ss2;
                 ss2 << "Got name \"" << name << "\" and value \"" << value << "\"";
-                TLMErrorLog::Log(ss2.str());
+                TLMErrorLog::Info(ss2.str());
                 mpSystemParent->setParameterValue(HString(name.c_str()),HString(value.c_str()));
             }
 

diff --git a/Hopsan/TLMPluginLib/TLMPluginInterfaceSignalOutput.hpp b/Hopsan/TLMPluginLib/TLMPluginInterfaceSignalOutput.hpp
@@ -55,6 +55,7 @@ namespace hopsan {
         void initialize()
         {
             bool foundHandler = false;
+
             for(size_t i=0; i<mpSystemParent->getSubComponents().size(); ++i)
             {
                 if(mpSystemParent->getSubComponents()[i]->getTypeName() == "TLMPluginHandler")

diff --git a/Hopsan/TLMPluginLib/common.h b/Hopsan/TLMPluginLib/common.h
@@ -33,18 +33,18 @@ inline tlmConfig_t readTlmConfigFile(std::string path)
     }
 
     //Print results to log file
-    TLMErrorLog::Log("---"+std::string(TLM_CONFIG_FILE_NAME)+"---");
-    TLMErrorLog::Log("model: "+tlmConfig.model);
-    TLMErrorLog::Log("server: "+tlmConfig.server);
+    TLMErrorLog::Info("---"+std::string(TLM_CONFIG_FILE_NAME)+"---");
+    TLMErrorLog::Info("model: "+tlmConfig.model);
+    TLMErrorLog::Info("server: "+tlmConfig.server);
     std::stringstream ss1;
     ss1 << "tstart: " << tlmConfig.tstart;
-    TLMErrorLog::Log(ss1.str());
+    TLMErrorLog::Info(ss1.str());
     std::stringstream ss2;
     ss2 << "tend: " << tlmConfig.tend;
-    TLMErrorLog::Log(ss2.str());
+    TLMErrorLog::Info(ss2.str());
     std::stringstream ss3;
     ss3 << "hmax: " << tlmConfig.hmax;
-    TLMErrorLog::Log(ss3.str());
+    TLMErrorLog::Info(ss3.str());
 
     return tlmConfig;
 }

diff --git a/Modelica/tlmforce.cc b/Modelica/tlmforce.cc
@@ -73,7 +73,7 @@ void initialize_TLM()
             TLMErrorLog::SetOutStream(debugOutFile);
         }
 
-        TLMErrorLog::SetDebugOut(true);
+        TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
     }
 
     if(!tlmConfigFile.good()) {
@@ -127,7 +127,12 @@ void set_debug_mode(int debugFlgIn)
         cerr << "Debug off" << endl;
     }
 
-    TLMErrorLog::SetDebugOut(debugFlg);
+    if(debugFlg) {
+        TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
+    }
+    else {
+        TLMErrorLog::SetLogLevel(TLMLogLevel::Warning);
+    }
 }
 
 double get_tlm_delay()

diff --git a/OMFMISimulatorWrapper/main.cpp b/OMFMISimulatorWrapper/main.cpp
@@ -149,9 +149,7 @@ int main(int argc, char *argv[])
       TLMErrorLog::SetOutStream(DebugOutFile);
     }
 
-    TLMErrorLog::SetDebugOut(true);
-    TLMErrorLog::SetNormalErrorLogOn(true);
-    TLMErrorLog::SetWarningOut(true);
+    TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
   }
 
   for(size_t i=0; i<options.interfaces.size(); ++i) {

diff --git a/OpenModelica/tlmforce.cc b/OpenModelica/tlmforce.cc
@@ -119,14 +119,16 @@ void set_debug_mode(int debugFlgIn)
 {
     debugFlg = debugFlgIn;
 
-    TLMErrorLog::SetDebugOut(debugFlg);
+    if(debugFlgIn) {
+        TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
+    }
 
     if( debugFlg ){
         if( !debugOutFile.is_open() ){
 	    debugOutFile.open(TLM_DEBUG_FILE_NAME);
 	    if( !debugOutFile.good() ){
 	      TLMErrorLog::SetOutStream(debugOutFile);
-	      TLMErrorLog::Log("Debug on");
+        TLMErrorLog::Info("Debug on");
 	    }
 	    else{
 	      TLMErrorLog::Warning(std::string("Unable to open debug log ") + TLM_DEBUG_FILE_NAME );
@@ -137,7 +139,7 @@ void set_debug_mode(int debugFlgIn)
 	}
     }
     else {
-        TLMErrorLog::Log("Debug off");
+        TLMErrorLog::Info("Debug off");
         debugOutFile.close();
     }
 }
@@ -176,7 +178,7 @@ double get_tlm_delay()
     double res = maxStep;
     tlmConfigFile.close();
 
-    TLMErrorLog::Log(model + ": get_tlm_delay (" + TLMErrorLog::ToStdStr(res) + ")");
+    TLMErrorLog::Info(model + ": get_tlm_delay (" + TLMErrorLog::ToStdStr(res) + ")");
 
     return res;
 }
@@ -425,7 +427,7 @@ void get_tlm_input_value(void* in_TLMPluginStructObj,
                     double simTime,    // Current simulation time
                     double value[])   // Output value
 {
-    TLMErrorLog::Log("CALLING: get_tlm_input_value(time = "+TLMErrorLog::ToStdStr(simTime)+")");
+    TLMErrorLog::Info("CALLING: get_tlm_input_value(time = "+TLMErrorLog::ToStdStr(simTime)+")");
     TLMPluginStruct* TLMPluginStructObj = (TLMPluginStruct*)in_TLMPluginStructObj;
 
     bool allRegistered = (TLMPluginStructObj->referenceCount == TLMPluginStructObj->registerCount);
@@ -459,7 +461,7 @@ void set_tlm_output_value(void* in_TLMPluginStructObj,
                           double simTime,    // Current simulation time
                           double value)   // Output force
 {
-    TLMErrorLog::Log("CALLING: set_tlm_output_value(time = "+TLMErrorLog::ToStdStr(simTime)+")");
+    TLMErrorLog::Info("CALLING: set_tlm_output_value(time = "+TLMErrorLog::ToStdStr(simTime)+")");
     TLMPluginStruct* TLMPluginStructObj = (TLMPluginStruct*)in_TLMPluginStructObj;
 
     // Check if interface is registered. If it's not, register it

diff --git a/Simulink/tlmforce.cc b/Simulink/tlmforce.cc
@@ -81,7 +81,7 @@ TLM_InterfaceReg::TLM_InterfaceReg(bool debugFlg):
         maxStep = 1.0e-10;
     }
 
-    TLMErrorLog::Log( "Try to initialize Simulink plugin." );
+    TLMErrorLog::Info( "Try to initialize Simulink plugin." );
 
     if(! Plugin->Init( model,
 		       timeStart,
@@ -92,14 +92,14 @@ TLM_InterfaceReg::TLM_InterfaceReg(bool debugFlg):
 	exit(1);
     }
 
-    TLMErrorLog::Log( "TLM Simulink plugin was initialized" );   
+    TLMErrorLog::Info( "TLM Simulink plugin was initialized" );   
 }
 
 TLM_InterfaceReg::~TLM_InterfaceReg() {
 }
 
 void TLM_InterfaceReg::SetDebugOut(){
-    Plugin->SetDebugOut(true);
+    TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
 }
 
 TLM_InterfaceReg* TLM_InterfaceReg::GetInstance(bool debugFlg)
@@ -113,7 +113,7 @@ TLM_InterfaceReg* TLM_InterfaceReg::GetInstance(bool debugFlg)
 
 void TLM_InterfaceReg::RegisterInterface(std::string ifID, int dimensions, std::string causality, std::string domain) {
     // No way to get the real marker name from the solver - using "M<ID>"
-    TLMErrorLog::Log( "Trying to register interface " + ifID );
+    TLMErrorLog::Info( "Trying to register interface " + ifID );
 
     if( InterfaceIDmap.count(ifID) > 0 ){
 	TLMErrorLog::FatalError( "Try to register same interface twice " + ifID );
@@ -268,7 +268,7 @@ static void mdlInitializeSampleTimes(SimStruct *S)
     TLM_InterfaceReg::GetInstance(false)->GetSimParameters(sTime, eTime, timeStep);
     // true or false in GetInstance(...) enables/disables debug output
 
-    TLMErrorLog::Log("Set sample time to " + ToStr(timeStep));
+    TLMErrorLog::Info("Set sample time to " + ToStr(timeStep));
 
     /* Set TLM delay here! */
     ssSetSampleTime(S, 0, CONTINUOUS_SAMPLE_TIME);
@@ -361,10 +361,10 @@ static void mdlOutputs(SimStruct *S, int_T tid)
                                                                force);
 
 
-        TLMErrorLog::Log("Got force for: " + std::string(name) );
-        TLMErrorLog::Log("time: " + ToStr(time) );
-        TLMErrorLog::Log("F: " + ToStr(force[0]) + " " +  ToStr(force[1]) + " " + ToStr(force[2]) );
-        TLMErrorLog::Log("M: " + ToStr(force[3]) + " " +  ToStr(force[4]) + " " + ToStr(force[5]) );
+        TLMErrorLog::Info("Got force for: " + std::string(name) );
+        TLMErrorLog::Info("time: " + ToStr(time) );
+        TLMErrorLog::Info("F: " + ToStr(force[0]) + " " +  ToStr(force[1]) + " " + ToStr(force[2]) );
+        TLMErrorLog::Info("M: " + ToStr(force[3]) + " " +  ToStr(force[4]) + " " + ToStr(force[5]) );
 
 #ifdef DEBUGFLG
         if( isnan(force[0]) || isnan(force[1]) || isnan(force[2]) ){
@@ -376,8 +376,8 @@ static void mdlOutputs(SimStruct *S, int_T tid)
         /* Get Position and Orientation */
         TLM_InterfaceReg::GetInstance()->GetPlugin()->GetTimeData3D(ifID, time, CurTimeData);        
 
-        TLMErrorLog::Log("Got position for: " + std::string(name) );
-        TLMErrorLog::Log("R: " + ToStr(CurTimeData.Position[0]) + " " +  ToStr(CurTimeData.Position[1]) + " " + ToStr(CurTimeData.Position[2]) );
+        TLMErrorLog::Info("Got position for: " + std::string(name) );
+        TLMErrorLog::Info("R: " + ToStr(CurTimeData.Position[0]) + " " +  ToStr(CurTimeData.Position[1]) + " " + ToStr(CurTimeData.Position[2]) );
 
     }
     else {
@@ -446,14 +446,14 @@ static void mdlOutputs(SimStruct *S, int_T tid)
           int ifID = TLM_InterfaceReg::GetInstance()->GetInterfaceID(name);
 
           if( ifID >= 0 ){          
-              TLMErrorLog::Log("Call SetMotion for: " + std::string(name) );
-              TLMErrorLog::Log("time: " + ToStr(time) );
-              TLMErrorLog::Log("R: " + ToStr(R[0]) + " " +  ToStr(R[1]) + " " + ToStr(R[2]) );
-              //TLMErrorLog::Log("A0: " + ToStr(A[0]) + " " +  ToStr(A[1]) + " " + ToStr(A[2]) );
-              //TLMErrorLog::Log("A1: " + ToStr(A[3]) + " " +  ToStr(A[4]) + " " + ToStr(A[5]) );
-              //TLMErrorLog::Log("A2: " + ToStr(A[6]) + " " +  ToStr(A[7]) + " " + ToStr(A[8]) );
-              TLMErrorLog::Log("vR: " + ToStr(vR[0]) + " " +  ToStr(vR[1]) + " " + ToStr(vR[2]) );
-              //TLMErrorLog::Log("Omega: " + ToStr(Omega[0]) + " " +  ToStr(Omega[1]) + " " + ToStr(Omega[2]) );
+              TLMErrorLog::Info("Call SetMotion for: " + std::string(name) );
+              TLMErrorLog::Info("time: " + ToStr(time) );
+              TLMErrorLog::Info("R: " + ToStr(R[0]) + " " +  ToStr(R[1]) + " " + ToStr(R[2]) );
+              //TLMErrorLog::Info("A0: " + ToStr(A[0]) + " " +  ToStr(A[1]) + " " + ToStr(A[2]) );
+              //TLMErrorLog::Info("A1: " + ToStr(A[3]) + " " +  ToStr(A[4]) + " " + ToStr(A[5]) );
+              //TLMErrorLog::Info("A2: " + ToStr(A[6]) + " " +  ToStr(A[7]) + " " + ToStr(A[8]) );
+              TLMErrorLog::Info("vR: " + ToStr(vR[0]) + " " +  ToStr(vR[1]) + " " + ToStr(vR[2]) );
+              //TLMErrorLog::Info("Omega: " + ToStr(Omega[0]) + " " +  ToStr(Omega[1]) + " " + ToStr(Omega[2]) );
 
               TLM_InterfaceReg::GetInstance()->GetPlugin()->SetMotion3D(ifID,          // Send data to the Plugin
                                                                       time,

diff --git a/Simulink/tlmsignal.cc b/Simulink/tlmsignal.cc
@@ -83,7 +83,7 @@ TLM_InterfaceReg::TLM_InterfaceReg(bool debugFlg):
         maxStep = 1.0e-10;
     }
 
-    TLMErrorLog::Log( "Try to initialize Simulink plugin." );
+    TLMErrorLog::Info( "Try to initialize Simulink plugin." );
 
     if(! Plugin->Init( model,
 		       timeStart,
@@ -94,14 +94,14 @@ TLM_InterfaceReg::TLM_InterfaceReg(bool debugFlg):
 	exit(1);
     }
 
-    TLMErrorLog::Log( "TLM Simulink plugin was initialized" );   
+    TLMErrorLog::Info( "TLM Simulink plugin was initialized" );   
 }
 
 TLM_InterfaceReg::~TLM_InterfaceReg() {
 }
 
 void TLM_InterfaceReg::SetDebugOut(){
-    Plugin->SetDebugOut(true);
+    TLMErrorLog::SetLogLevel(TLMLogLevel::Debug);
 }
 
 TLM_InterfaceReg* TLM_InterfaceReg::GetInstance(bool debugFlg)
@@ -115,7 +115,7 @@ TLM_InterfaceReg* TLM_InterfaceReg::GetInstance(bool debugFlg)
 
 void TLM_InterfaceReg::RegisterInterface(std::string ifID, int dimensions, std::string causality, std::string domain) {
     // No way to get the real marker name from the solver - using "M<ID>"
-    TLMErrorLog::Log( "Trying to register interface " + ifID );
+    TLMErrorLog::Info( "Trying to register interface " + ifID );
 
     if( InterfaceIDmap.count(ifID) > 0 ){
 	TLMErrorLog::FatalError( "Try to register same interface twice " + ifID );
@@ -265,7 +265,7 @@ static void mdlInitializeSampleTimes(SimStruct *S)
     TLM_InterfaceReg::GetInstance(true)->GetSimParameters(sTime, eTime, timeStep);
     // true or false in GetInstance(...) enables/disables debug output
 
-    TLMErrorLog::Log("Set sample time to " + ToStr(timeStep));
+    TLMErrorLog::Info("Set sample time to " + ToStr(timeStep));
 
     /* Set TLM delay here! */
     ssSetSampleTime(S, 0, CONTINUOUS_SAMPLE_TIME);
@@ -360,9 +360,9 @@ static void mdlOutputs(SimStruct *S, int_T tid)
                                                                time,
                                                                value);
 
-            TLMErrorLog::Log("Got value for: " + std::string(name) );
-            TLMErrorLog::Log("time: " + ToStr(time) );
-            TLMErrorLog::Log("y: " + ToStr(*value));
+            TLMErrorLog::Info("Got value for: " + std::string(name) );
+            TLMErrorLog::Info("time: " + ToStr(time) );
+            TLMErrorLog::Info("y: " + ToStr(*value));
 
 
     #ifdef DEBUGFLG
@@ -402,9 +402,9 @@ static void mdlOutputs(SimStruct *S, int_T tid)
 //            int ifID = TLM_InterfaceReg::GetInstance()->GetInterfaceID(name);
 
 //            if( ifID >= 0 ){
-//                TLMErrorLog::Log("Call SetValueSignal for: " + std::string(name) );
-//                TLMErrorLog::Log("time: " + ToStr(time) );
-//                TLMErrorLog::Log("u: " + ToStr(*u) );
+//                TLMErrorLog::Info("Call SetValueSignal for: " + std::string(name) );
+//                TLMErrorLog::Info("time: " + ToStr(time) );
+//                TLMErrorLog::Info("u: " + ToStr(*u) );
 
 //                TLM_InterfaceReg::GetInstance()->GetPlugin()->SetValueSignal(ifID,          // Send data to the Plugin
 //                                                                             time,
@@ -443,9 +443,9 @@ static void mdlUpdate(SimStruct *S, int_T tid)
             int ifID = TLM_InterfaceReg::GetInstance()->GetInterfaceID(name);
 
             if( ifID >= 0 ){
-                TLMErrorLog::Log("Call SetValueSignal for: " + std::string(name) );
-                TLMErrorLog::Log("time: " + ToStr(time) );
-                TLMErrorLog::Log("u: " + ToStr(*u) );
+                TLMErrorLog::Info("Call SetValueSignal for: " + std::string(name) );
+                TLMErrorLog::Info("time: " + ToStr(time) );
+                TLMErrorLog::Info("u: " + ToStr(*u) );
 
                 TLM_InterfaceReg::GetInstance()->GetPlugin()->SetValueSignal(ifID,          // Send data to the Plugin
                                                                              time,