X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf74de4a878beaa5177d7ea2fc4e11b550240559..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/instr/jedule/jedule_events.cpp

diff --git a/src/instr/jedule/jedule_events.cpp b/src/instr/jedule/jedule_events.cpp
index 8efdbd3e67..5789db9e12 100644
--- a/src/instr/jedule/jedule_events.cpp
+++ b/src/instr/jedule/jedule_events.cpp
@@ -1,45 +1,39 @@
-/* Copyright (c) 2010-2014. The SimGrid Team.
+/* Copyright (c) 2010-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * 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 <stdio.h>
-#include <stdlib.h>
-#include <string>
-
+#include "simgrid/jedule/jedule.hpp"
+#include "simgrid/s4u/NetZone.hpp"
 #include "xbt/asserts.h"
 
-#if HAVE_JEDULE
+#if SIMGRID_HAVE_JEDULE
 namespace simgrid{
 namespace jedule{
 
-void Event::deleteEvent(){
-  while (!this->resource_subsets.empty()){
-    xbt_free(this->resource_subsets.back());
-    this->resource_subsets.pop_back();
-  }
-  delete this;
+Event::Event(std::string name, double start_time, double end_time, std::string type)
+  : name(name), start_time(start_time), end_time(end_time), type(type)
+{
+  this->resource_subsets = new std::vector<jed_subset_t>();
 }
 
-void Event::addResources(std::vector<sg_host_t> *host_selection) {
-  xbt_dynar_t resource_subset_list;
-  jed_res_subset_t res_set;
-  unsigned int i;
-
-  resource_subset_list = xbt_dynar_new(sizeof(jed_res_subset_t), nullptr);
-
-  jed_simgrid_get_resource_selection_by_hosts(resource_subset_list, host_selection);
-  xbt_dynar_foreach(resource_subset_list, i, res_set)  {
-    this->resource_subsets.push_back(res_set);
+Event::~Event()
+{
+  if (not this->resource_subsets->empty()) {
+    for (auto const& subset : *this->resource_subsets)
+      delete subset;
+    delete this->resource_subsets;
   }
+}
 
-  xbt_dynar_free_container(&resource_subset_list);
+void Event::addResources(std::vector<sg_host_t> *host_selection)
+{
+  get_resource_selection_by_hosts(this->resource_subsets, host_selection);
 }
 
-void Event::addCharacteristic(char *characteristic) {
+void Event::addCharacteristic(char *characteristic)
+{
   xbt_assert( characteristic != nullptr );
   this->characteristics_list.push_back(characteristic);
 }
@@ -49,37 +43,35 @@ void Event::addInfo(char* key, char *value) {
   this->info_map.insert({key, value});
 }
 
-void Event::print(FILE *jed_file){
+void Event::print(FILE *jed_file)
+{
   fprintf(jed_file, "    <event>\n");
   fprintf(jed_file, "      <prop key=\"name\" value=\"%s\" />\n", this->name.c_str());
   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());
-  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();
+  xbt_assert(not this->resource_subsets->empty());
+  fprintf(jed_file, "      <res_util>\n");
+  for (auto const& subset : *this->resource_subsets) {
     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()){
+
+  if (not this->characteristics_list.empty()) {
     fprintf(jed_file, "      <characteristics>\n");
-    for (auto ch: this->characteristics_list)
+    for (auto const& ch : this->characteristics_list)
       fprintf(jed_file, "          <characteristic name=\"%s\" />\n", ch);
     fprintf(jed_file, "      </characteristics>\n");
   }
 
-  if (!this->info_map.empty()){
+  if (not this->info_map.empty()) {
     fprintf(jed_file, "      <info>\n");
-    print_key_value_dict(jed_file, this->info_map);
+    for (auto const& elm : this->info_map)
+      fprintf(jed_file, "        <prop key=\"%s\" value=\"%s\" />\n",elm.first,elm.second);
     fprintf(jed_file, "      </info>\n");
   }