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

diff --git a/src/surf/trace_mgr.cpp b/src/surf/trace_mgr.cpp
index 838b9e75cd..bdf633941a 100644
--- a/src/surf/trace_mgr.cpp
+++ b/src/surf/trace_mgr.cpp
@@ -18,18 +18,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), NULL);
-}
-
-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()
 {
@@ -39,7 +30,7 @@ simgrid::trace_mgr::future_evt_set::~future_evt_set()
 tmgr_trace_t tmgr_trace_new_from_string(const char *name, const char *input, double periodicity)
 {
   int linecount = 0;
-  tmgr_event_t last_event = NULL;
+  tmgr_event_t last_event = nullptr;
   unsigned int cpt;
   char *val;
 
@@ -73,11 +64,11 @@ 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;
@@ -94,7 +85,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 != NULL,
+  xbt_assert(f != nullptr,
       "Cannot open file '%s' (path=%s)", filename, xbt_str_join(surf_path, ":"));
 
   char *tstr = xbt_str_from_file(f);
@@ -105,13 +96,13 @@ tmgr_trace_t tmgr_trace_new_from_file(const char *filename)
   return trace;
 }
 
-tmgr_trace_t tmgr_empty_trace_new(void)
+tmgr_trace_t tmgr_empty_trace_new()
 {
   tmgr_trace_t trace = new simgrid::trace_mgr::trace();
   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;
 }
@@ -124,14 +115,14 @@ void tmgr_trace_free(tmgr_trace_t trace)
 /** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace  */
 tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::add_trace(tmgr_trace_t trace, double start_time, surf::Resource *resource)
 {
-  tmgr_trace_iterator_t trace_iterator = NULL;
+  tmgr_trace_iterator_t trace_iterator = nullptr;
 
   trace_iterator = xbt_new0(s_tmgr_trace_event_t, 1);
   trace_iterator->trace = trace;
   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);
 
@@ -147,26 +138,26 @@ double simgrid::trace_mgr::future_evt_set::next_date() const
     return -1.0;
 }
 
-/** @brief Retrieves the next occurring event, or NULL if none happens before #date */
+/** @brief Retrieves the next occurring event, or nullptr if none happens before #date */
 tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq(
     double date, double *value, simgrid::surf::Resource **resource)
 {
   double event_date = next_date();
   if (event_date > date)
-    return NULL;
+    return nullptr;
 
   tmgr_trace_iterator_t trace_iterator = (tmgr_trace_iterator_t)xbt_heap_pop(p_heap);
-  if (trace_iterator == NULL)
-    return NULL;
+  if (trace_iterator == nullptr)
+    return nullptr;
 
   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 */
@@ -179,7 +170,7 @@ tmgr_trace_iterator_t simgrid::trace_mgr::future_evt_set::pop_leq(
   return trace_iterator;
 }
 
-void tmgr_finalize(void)
+void tmgr_finalize()
 {
   for (auto kv : trace_list) {
     xbt_free((char*)kv.first);