add xml root element for logFormat=xml

OpenModelica · Oct 27, 2016 · c98026b · c98026b
1 parent c237c18
commit c98026b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/SimulationRuntime/c/simulation/simulation_runtime.cpp b/SimulationRuntime/c/simulation/simulation_runtime.cpp
@@ -953,6 +953,10 @@ int _main_SimulationRuntime(int argc, char**argv, DATA *data, threadData_t *thre
 
     data->callback->callExternalObjectDestructors(data, threadData);
     deInitializeDataStruc(data);
+
+    /*  in case of xml log format close root element messages */
+    messagesCloseXMLroot();
+
     fflush(NULL);
   MMC_CATCH_INTERNAL(globalJumpBuffer)
 

diff --git a/SimulationRuntime/c/util/omc_error.c b/SimulationRuntime/c/util/omc_error.c
@@ -263,8 +263,30 @@ void messageText(int type, int stream, int indentNext, char *msg, int subline, c
   if (indentNext) level[stream]++;
 }
 
+static int printXMLrootNode = 0;
+
+static void messagesXMLroot()
+{
+  fputs("<messages>\n", stdout);
+  fflush(stdout);
+}
+
+void messagesCloseXMLroot()
+{
+  if (printXMLrootNode){
+    fputs("</messages>\n", stdout);
+    fflush(stdout);
+  }
+}
+
 void messageXML(int type, int stream, int indentNext, char *msg, int subline, const int *indexes)
 {
+  /* print xml root node */
+  if(!printXMLrootNode){
+    messagesXMLroot();
+    printXMLrootNode = 1;
+  }
+
   printf("<message stream=\"%s\" type=\"%s\" text=\"", LOG_STREAM_NAME[stream], LOG_TYPE_DESC[type]);
   printEscapedXML(msg);
   if (indexes) {

diff --git a/SimulationRuntime/c/util/omc_error.h b/SimulationRuntime/c/util/omc_error.h
@@ -144,6 +144,7 @@ extern int showAllWarnings;
 extern char logBuffer[2048];
 
 void setStreamPrintXML(int isXML);
+void messagesCloseXMLroot();
 
 #define ACTIVE_STREAM(stream)    (useStream[stream])
 #define ACTIVE_WARNING_STREAM(stream)    (showAllWarnings || useStream[stream])