X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..d89593eda3b667f2819209d6da0d7459d7338208:/src/surf/trace_mgr.cpp

diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp
index e4d1f1404c..5455bdbb3a 100644
--- a/src/surf/trace_mgr.cpp
+++ b/src/surf/trace_mgr.cpp
@@ -5,12 +5,17 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/sysdep.h"
+#include "xbt/dict.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
-#include "xbt/dict.h"
+
 #include "src/surf/trace_mgr.hpp"
+#include "src/surf/surf_interface.hpp"
 #include "surf_private.h"
 #include "xbt/RngStream.h"
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/split.hpp>
 #include <math.h>
 #include <unordered_map>
 
@@ -18,18 +23,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_trace, surf, "Surf trace management");
 
 static std::unordered_map<const char *, simgrid::trace_mgr::trace*> trace_list;
 
-simgrid::trace_mgr::trace::trace()
-{
-  event_list = xbt_dynar_new(sizeof(s_tmgr_event_t), nullptr);
-}
-
-simgrid::trace_mgr::trace::~trace()
-{
-  xbt_dynar_free(&event_list);
-}
-simgrid::trace_mgr::future_evt_set::future_evt_set()
-{
-}
+simgrid::trace_mgr::trace::trace()=default;
+simgrid::trace_mgr::trace::~trace()=default;
+simgrid::trace_mgr::future_evt_set::future_evt_set()=default;
 
 simgrid::trace_mgr::future_evt_set::~future_evt_set()
 {
@@ -40,26 +36,24 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, dou
 {
   int linecount = 0;
   tmgr_event_t last_event = nullptr;
-  unsigned int cpt;
-  char *val;
 
   xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name);
   xbt_assert(periodicity >= 0, "Invalid periodicity %g (must be positive)", periodicity);
 
   tmgr_trace_t trace = new simgrid::trace_mgr::trace();
 
-  xbt_dynar_t list = xbt_str_split(input, "\n\r");
-  xbt_dynar_foreach(list, cpt, val) {
+  std::vector<std::string> list;
+  boost::split(list, input, boost::is_any_of("\n\r"));
+  for (auto val : list) {
     s_tmgr_event_t event;
     linecount++;
-    xbt_str_trim(val, " \t\n\r\x0B");
+    boost::trim(val);
     if (val[0] == '#' || val[0] == '\0' || val[0] == '%') // pass comments
       continue;
-
-    if (sscanf(val, "PERIODICITY " "%lg" "\n", &periodicity) == 1)
+    if (sscanf(val.c_str(), "PERIODICITY " "%lg" "\n", &periodicity) == 1)
       continue;
 
-    xbt_assert(sscanf(val, "%lg" " " "%lg" "\n", &event.delta, &event.value) == 2,
+    xbt_assert(sscanf(val.c_str(), "%lg" " " "%lg" "\n", &event.delta, &event.value) == 2,
         "%s:%d: Syntax error in trace\n%s", name, linecount, input);
 
     if (last_event) {
@@ -73,18 +67,17 @@ tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, dou
         s_tmgr_event_t first_event;
         first_event.delta=event.delta;
         first_event.value=-1.0;
-        xbt_dynar_push(trace->event_list, &first_event);
+        trace->event_list.push_back(first_event);
       }
     }
-    xbt_dynar_push(trace->event_list, &event);
-    last_event = (tmgr_event_t)xbt_dynar_get_ptr(trace->event_list, xbt_dynar_length(trace->event_list) - 1);
+    trace->event_list.push_back(event);
+    last_event = &(trace->event_list.back());
   }
   if (last_event)
     last_event->delta = periodicity;
 
   trace_list.insert({xbt_strdup(name), trace});
 
-  xbt_dynar_free(&list);
   return trace;
 }
 
@@ -94,8 +87,7 @@ tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
   xbt_assert(trace_list.find(filename) == trace_list.end(), "Refusing to define trace %s twice", filename);
 
   FILE *f = surf_fopen(filename, "r");
-  xbt_assert(f != nullptr,
-      "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
+  xbt_assert(f != nullptr, "Cannot open file '%s' (path=%s)", filename, (boost::join(surf_path, ":")).c_str());
 
   char *tstr = xbt_str_from_file(f);
   fclose(f);
@@ -111,7 +103,7 @@ tmgr_trace_t tmgr_empty_trace_new()
   s_tmgr_event_t event;
   event.delta = 0.0;
   event.value = 0.0;
-  xbt_dynar_push(trace->event_list, &event);
+  trace->event_list.push_back(event);
 
   return trace;
 }
@@ -131,7 +123,7 @@ tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t
   trace_iterator->idx = 0;
   trace_iterator->resource = resource;
 
-  xbt_assert((trace_iterator->idx < xbt_dynar_length(trace->event_list)), "Your trace should have at least one event!");
+  xbt_assert((trace_iterator->idx < trace->event_list.size()), "Your trace should have at least one event!");
 
   xbt_heap_push(p_heap, trace_iterator, start_time);
 
@@ -162,11 +154,11 @@ tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq(
   tmgr_trace_t trace = trace_iterator->trace;
   *resource = trace_iterator->resource;
 
-  tmgr_event_t event = (tmgr_event_t)xbt_dynar_get_ptr(trace->event_list, trace_iterator->idx);
+  tmgr_event_t event = &(trace->event_list.at(trace_iterator->idx));
 
   *value = event->value;
 
-  if (trace_iterator->idx < xbt_dynar_length(trace->event_list) - 1) {
+  if (trace_iterator->idx < trace->event_list.size() - 1) {
     xbt_heap_push(p_heap, trace_iterator, event_date + event->delta);
     trace_iterator->idx++;
   } else if (event->delta > 0) {        /* Last element, checking for periodicity */