Move default success messages from stdout to LOG_SUCCESS

Belonging to [master]: - OpenModelica/OMCompiler#1979 - OpenModelica/OpenModelica-testsuite#762
OpenModelica · Nov 6, 2017 · bb335c6 · bb335c6
1 parent 691f4e9
commit bb335c6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -126,6 +126,7 @@ void setGlobalVerboseLevel(int argc, char**argv)
     /* default activated */
     useStream[LOG_STDOUT] = 1;
     useStream[LOG_ASSERT] = 1;
+    useStream[LOG_SUCCESS] = 1;
     return; // no lv flag given.
   }
 
@@ -161,6 +162,11 @@ void setGlobalVerboseLevel(int argc, char**argv)
           useStream[i] = 1;
           error = 0;
         }
+        else if(flag == string("-") + string(LOG_STREAM_NAME[i]))
+        {
+          useStream[i] = 0;
+          error = 0;
+        }
       }
 
       if(error)

diff --git a/SimulationRuntime/c/simulation/solver/initialization/initialization.c b/SimulationRuntime/c/simulation/solver/initialization/initialization.c
@@ -310,7 +310,7 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
   retVal = data->callback->functionRemovedInitialEquations(data, threadData);
 
   if (!retVal)
-    infoStreamPrint(LOG_STDOUT, 0, "The initialization finished successfully %s homotopy method.", data->simulationInfo->homotopyUsed ? "with" : "without");
+    infoStreamPrint(LOG_SUCCESS, 0, "The initialization finished successfully %s homotopy method.", data->simulationInfo->homotopyUsed ? "with" : "without");
 
   TRACE_POP
   return retVal;

diff --git a/SimulationRuntime/c/simulation/solver/solver_main.c b/SimulationRuntime/c/simulation/solver/solver_main.c
@@ -791,7 +791,7 @@ int solver_main(DATA* data, threadData_t *threadData, const char* init_initMetho
   }
 
   if (!retVal)
-    infoStreamPrint(LOG_STDOUT, 0, "The simulation finished successfully.");
+    infoStreamPrint(LOG_SUCCESS, 0, "The simulation finished successfully.");
 
   TRACE_POP
   return retVal;

diff --git a/SimulationRuntime/c/util/omc_error.c b/SimulationRuntime/c/util/omc_error.c
@@ -75,6 +75,7 @@ const char *LOG_STREAM_NAME[SIM_LOG_MAX] = {
   "LOG_SOTI",
   "LOG_STATS",
   "LOG_STATS_V",
+  "LOG_SUCCESS",
 #ifdef USE_DEBUG_TRACE
   "LOG_TRACE",
 #endif
@@ -121,6 +122,7 @@ const char *LOG_STREAM_DESC[SIM_LOG_MAX] = {
   "final solution of the initialization",                                       /* LOG_SOTI */
   "additional statistics about timer/events/solver",                            /* LOG_STATS */
   "additional statistics for LOG_STATS",                                        /* LOG_STATS_V */
+  "this stream is always active, unless deactivated with -lv=-LOG_SUCCESS",     /* LOG_SUCCESS */
 #ifdef USE_DEBUG_TRACE
   "enables additional output to trace call stack",                              /* LOG_TRACE */
 #endif
@@ -161,6 +163,7 @@ void initDumpSystem()
 
   useStream[LOG_STDOUT] = 1;
   useStream[LOG_ASSERT] = 1;
+  useStream[LOG_SUCCESS] = 1;
 }
 
 void printInfo(FILE *stream, FILE_INFO info)

diff --git a/SimulationRuntime/c/util/omc_error.h b/SimulationRuntime/c/util/omc_error.h
@@ -113,6 +113,7 @@ enum LOG_STREAM
   LOG_SOTI,
   LOG_STATS,
   LOG_STATS_V,
+  LOG_SUCCESS,
 #ifdef USE_DEBUG_TRACE
   LOG_TRACE,
 #endif