plug leak

[simgrid.git] / src / instr / jedule / jedule_output.cpp

diff --git a/src/instr/jedule/jedule_output.cpp b/src/instr/jedule/jedule_output.cpp
index 64f6875..99a71dc 100644 (file)
--- a/src/instr/jedule/jedule_output.cpp
+++ b/src/instr/jedule/jedule_output.cpp
@@ -16,52 +16,33 @@
 
 #if HAVE_JEDULE
 
-#define STR_BUF_SIZE 1024
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_out, jedule, "Logging specific to Jedule output");
 
 xbt_dynar_t jedule_event_list;
 
-
-void print_key_value_dict(FILE *jed_file, std::unordered_map<char*, char*> key_value_dict) {
-  if(!key_value_dict.empty()) {
-    for (auto elm: key_value_dict) {
-      fprintf(jed_file, "        <prop key=\"%s\" value=\"%s\" />\n",elm.first,elm.second);
-    }
-  }
-}
-
-static void print_platform(FILE *jed_file, jed_container_t root_container) {
-  fprintf(jed_file, "  <platform>\n");
-  root_container->print(jed_file);
-  fprintf(jed_file, "  </platform>\n");
-}
-
-static void print_events(FILE *jed_file, xbt_dynar_t event_list)  {
-  unsigned int i;
-  jed_event_t event;
-
-  fprintf(jed_file, "  <events>\n");
-  xbt_dynar_foreach(event_list, i, event) {
-      event->print(jed_file);
-  }
-  fprintf(jed_file, "  </events>\n");
-}
-
-void write_jedule_output(FILE *file, jedule_t jedule, xbt_dynar_t event_list, xbt_dict_t meta_info_dict) {
+void write_jedule_output(FILE *file, jedule_t jedule, xbt_dynar_t event_list) {
   if (!xbt_dynar_is_empty(jedule_event_list)){
 
     fprintf(file, "<jedule>\n");
 
     if (!jedule->jedule_meta_info.empty()){
       fprintf(file, "  <jedule_meta>\n");
-      print_key_value_dict(file, jedule->jedule_meta_info);
+      for (auto elm: jedule->jedule_meta_info)
+        fprintf(file, "        <prop key=\"%s\" value=\"%s\" />\n",elm.first,elm.second);
       fprintf(file, "  </jedule_meta>\n");
     }
 
-    print_platform(file, jedule->root_container);
+    fprintf(file, "  <platform>\n");
+    jedule->root_container->print(file);
+    fprintf(file, "  </platform>\n");
 
-    print_events(file, event_list);
+    fprintf(file, "  <events>\n");
+    unsigned int i;
+    jed_event_t event;
+    xbt_dynar_foreach(event_list, i, event) {
+        event->print(file);
+    }
+    fprintf(file, "  </events>\n");
 
     fprintf(file, "</jedule>\n");
   }