allow disabling of 'stdout' and 'assert' streams

Belonging to [master]:
  - #2573

Author: adrpo

SimulationRuntime/c/simulation/simulation_runtime.cpp

@@ -131,6 +131,10 @@ void setGlobalVerboseLevel(int argc, char**argv)
     return; // no lv flag given.
   }
 
+  /* default activated, but it can be disabled with -stdout or -assert */
+  useStream[LOG_STDOUT] = 1;
+  useStream[LOG_ASSERT] = 1;
+
   if(flags->find("LOG_ALL", 0) != string::npos)
   {
     for(i=1; i<SIM_LOG_MAX; ++i)
@@ -181,10 +185,6 @@ void setGlobalVerboseLevel(int argc, char**argv)
     }while(pos != string::npos);
   }
 
-  /* default activated */
-  useStream[LOG_STDOUT] = 1;
-  useStream[LOG_ASSERT] = 1;
-
   /* print LOG_SOTI if LOG_INIT is enabled */
   if(useStream[LOG_INIT])
     useStream[LOG_SOTI] = 1;

SimulationRuntime/c/util/omc_error.c

@@ -34,7 +34,7 @@
 /* For MMC_THROW, so we can end this thing */
 #include "meta/meta_modelica.h"
 
-const int firstOMCErrorStream = 3;
+const int firstOMCErrorStream = 1;
 
 const char *LOG_STREAM_NAME[SIM_LOG_MAX] = {
   "LOG_UNKNOWN",
@@ -85,8 +85,8 @@ const char *LOG_STREAM_NAME[SIM_LOG_MAX] = {
 
 const char *LOG_STREAM_DESC[SIM_LOG_MAX] = {
   "unknown",
-  "this stream is always active",                                               /* LOG_STDOUT */
-  "this stream is always active",                                               /* LOG_ASSERT */
+  "this stream is always active, can be disabled with -lv=-stdout",             /* LOG_STDOUT */
+  "this stream is always active, can be disabled with -lv=-assert",             /* LOG_ASSERT */
 
   "additional information about dassl solver",                                  /* LOG_DASSL */
   "outputs the states at every dassl call",                                     /* LOG_DASSL_STATES */

SimulationRuntime/cpp/omcCAPI/src/OMCTest.cpp

@@ -2,17 +2,37 @@
 #include "OMC.h"
 #include <string>
 #include <iostream>
-#include "meta/meta_modelica.h"
+#include <thread>
+
+#define GC_THREADS
+#include "gc.h"
+
 /*
 #include <boost/thread.hpp>
 #include <boost/chrono.hpp>
 */
-#include <pthread.h>
-void runTest(OMCData* omcData, std::string testfolder, std::string omhome)
+
+void runTest(std::string testfolder, std::string omhome)
 {
+
+  GC_stack_base sb;
+  GC_get_stack_base(&sb);
+  GC_register_my_thread(&sb);
+
   int status = 0;
   char *change_dir_results = 0, *mkDirResults = 0, *version = 0, *errorMsg2 = 0, *simulateResult = 0, *clear = 0;
 
+  OMCData *omcData;
+  std::cout << "Initialize OMC, use gcc compiler on folder: " << testfolder << std::endl;
+  // if you send in 1 here it will crash on Windows, i need do debug more why this happens
+  status = InitOMC(&omcData, "gcc", "");
+  if(status > 0)
+    std::cout << "..ok" << std::endl;
+  else
+    std::cout << "..failed" << std::endl;
+  /*----------------------------------------*/
+
+
   // create the test folder
   std::cout << "Create working directory of OMC: " << testfolder << std::endl;
   std::string mkDir = "mkdir(\"" + testfolder + "\")";
@@ -97,39 +117,29 @@ void runTest(OMCData* omcData, std::string testfolder, std::string omhome)
     std::cout << "..ok " << clear << std::endl;
   else
     std::cout << "..failed" << std::endl;
+
+  GC_unregister_my_thread();
 }
 
+#define MAX_THREADS 4
+
 int main(int argc, const char* argv[])
 {
-  OMCData *omcData = 0;
-  int status = 0;
+  std::thread threads[MAX_THREADS];
+  int i = 0;
 
   std::cout << "Test OMC C-API dll ..." << std::endl;
   InitMetaOMC();
+  GC_allow_register_threads();
 
-  /*----------------------------------------*/
-  std::cout << "Initialize OMC, use gcc compiler" << std::endl;
-  // if you send in 1 here it will crash on Windows, i need do debug more why this happens
-  status = InitOMC(&omcData, "gcc", "");
-  if(status > 0)
-    std::cout << "..ok" << std::endl;
-  else
-    std::cout << "..failed" << std::endl;
-  /*----------------------------------------*/
-
-
-  std::cout << "starting test 1" << std::endl;
-  std::string dir = "./tmp1";
-  runTest(omcData, dir, "");
-  std::cout << "starting test 2" << std::endl;
-  dir = "./tmp2";
-  runTest(omcData, dir, "");
-  std::cout << "starting test 3" << std::endl;
-  dir = "./tmp3";
-  runTest(omcData, dir, "");
-
-  /*------------------------------------------*/
+  for (i = 0; i < MAX_THREADS; i++)
+  {
+    std::string dir = std::string("./tmp") + std::to_string(i);
+    threads[i] = std::thread(runTest, dir, "");
+  }
 
-  FreeOMC(omcData);
+  for (i = 0; i < MAX_THREADS; i++)
+    if (threads[i].joinable())
+      threads[i].join();
 }