Enable Cpp logger under Windows and finalize it, ticket:4773

The finalizer shall flush buffers, e.g. of LoggerXMLTCP. Belonging to [master]: - OpenModelica/OMCompiler#2246
OpenModelica · Mar 1, 2018 · da270f8 · da270f8
1 parent 67e62cb
commit da270f8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -2381,13 +2381,14 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
               >>
             %>
 
+            Logger::finalize();
             return 0;
-
       }
       catch(ModelicaSimulationError& ex)
       {
           if(!ex.isSuppressed())
               std::cerr << "Simulation stopped with error in " << error_id_string(ex.getErrorID()) << ": "  << ex.what();
+          Logger::finalize();
           return 1;
       }
   }

diff --git a/SimulationRuntime/cpp/Core/Utils/extension/logger.cpp b/SimulationRuntime/cpp/Core/Utils/extension/logger.cpp
@@ -36,6 +36,12 @@ void Logger::initialize(LogSettings settings)
   }
 }
 
+void Logger::finalize()
+{
+  if (_instance != NULL)
+    delete _instance;
+}
+
 void Logger::writeInternal(std::string msg, LogCategory cat, LogLevel lvl,
                            LogStructure ls)
 {

diff --git a/SimulationRuntime/cpp/Include/Core/Utils/extension/logger.hpp b/SimulationRuntime/cpp/Include/Core/Utils/extension/logger.hpp
@@ -55,6 +55,8 @@ class BOOST_EXTENSION_LOGGER_DECL Logger
       initialize(LogSettings());
     }
 
+    static void finalize();
+
     static inline void write(std::string msg, LogCategory cat, LogLevel lvl)
     {
       if (_instance && _instance->isSet(cat, lvl))

diff --git a/SimulationRuntime/cpp/Makefile.omdev.mingw b/SimulationRuntime/cpp/Makefile.omdev.mingw
@@ -81,7 +81,7 @@ else
 	PARALLEL_OUTPUT_COMMAND=-DUSE_PARALLEL_OUTPUT=OFF
 endif
 
-USE_LOGGER="false"
+USE_LOGGER="true"
 ifeq ("$(USE_LOGGER)","true")
 	USE_LOGGER_COMMAND=-DUSE_LOGGER:BOOL=ON
 else