X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e4ee823e63a90fd91cbec6f2312c896ca4cabe0..3ebb95127bac9bc6d8ba66319f1db561e9a5c6c1:/src/instr/jedule/jedule_events.cpp?ds=sidebyside

diff --git a/src/instr/jedule/jedule_events.cpp b/src/instr/jedule/jedule_events.cpp
index 8efdbd3e67..d363720508 100644
--- a/src/instr/jedule/jedule_events.cpp
+++ b/src/instr/jedule/jedule_events.cpp
@@ -5,7 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/jedule/jedule_events.hpp"
-#include "simgrid/jedule/jedule_output.hpp"
+#include "simgrid/jedule/jedule.hpp"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
@@ -16,12 +16,11 @@
 namespace simgrid{
 namespace jedule{
 
-void Event::deleteEvent(){
+Event::~Event(){
   while (!this->resource_subsets.empty()){
     xbt_free(this->resource_subsets.back());
     this->resource_subsets.pop_back();
   }
-  delete this;
 }
 
 void Event::addResources(std::vector<sg_host_t> *host_selection) {
@@ -55,21 +54,17 @@ void Event::print(FILE *jed_file){
   fprintf(jed_file, "      <prop key=\"start\" value=\"%g\" />\n", this->start_time);
   fprintf(jed_file, "      <prop key=\"end\" value=\"%g\" />\n", this->end_time);
   fprintf(jed_file, "      <prop key=\"type\" value=\"%s\" />\n", this->type.c_str());
-  fprintf(jed_file, "      <res_util>\n");
 
   xbt_assert(!this->resource_subsets.empty());
+  fprintf(jed_file, "      <res_util>\n");
   for (auto subset: this->resource_subsets) {
-    int start = subset->start_idx;
-    int end   = subset->start_idx + subset->nres - 1;
-
-    std::string resid = subset->parent->getHierarchyAsString();
     fprintf(jed_file, "        <select resources=\"");
-    fprintf(jed_file, "%s", resid.c_str());
-    fprintf(jed_file, ".[%d-%d]", start, end);
+    fprintf(jed_file, "%s", subset->parent->getHierarchyAsString().c_str());
+    fprintf(jed_file, ".[%d-%d]", subset->start_idx, subset->start_idx + subset->nres - 1);
     fprintf(jed_file, "\" />\n");
   }
-
   fprintf(jed_file, "      </res_util>\n");
+
   if (!this->characteristics_list.empty()){
     fprintf(jed_file, "      <characteristics>\n");
     for (auto ch: this->characteristics_list)
@@ -79,7 +74,8 @@ void Event::print(FILE *jed_file){
 
   if (!this->info_map.empty()){
     fprintf(jed_file, "      <info>\n");
-    print_key_value_dict(jed_file, this->info_map);
+    for (auto elm: this->info_map)
+      fprintf(jed_file, "        <prop key=\"%s\" value=\"%s\" />\n",elm.first,elm.second);
     fprintf(jed_file, "      </info>\n");
   }