Fix xbt_assert with side effects.

[simgrid.git] / src / kernel / resource / profile / trace_mgr.cpp

diff --git a/src/kernel/resource/profile/trace_mgr.cpp b/src/kernel/resource/profile/trace_mgr.cpp
index 151f1f1..a796657 100644 (file)
--- a/src/kernel/resource/profile/trace_mgr.cpp
+++ b/src/kernel/resource/profile/trace_mgr.cpp
@@ -41,7 +41,45 @@ Profile::Profile()
   event_list.push_back(val);
 }
 Profile::~Profile()          = default;
-Profile* Profile::from_string(std::string name, std::string input, double periodicity)
+
+/** @brief Register this profile for that resource onto that FES,
+ * and get an iterator over the integrated trace  */
+Event* Profile::schedule(FutureEvtSet* fes, resource::Resource* resource)
+{
+  Event* event    = new Event();
+  event->profile  = this;
+  event->idx      = 0;
+  event->resource = resource;
+  event->free_me  = false;
+
+  xbt_assert((event->idx < event_list.size()), "Your profile should have at least one event!");
+
+  fes_ = fes;
+  fes_->add_event(0.0 /* start time */, event);
+
+  return event;
+}
+
+/** @brief Gets the next event from a profile */
+DatedValue Profile::next(Event* event)
+{
+  double event_date  = fes_->next_date();
+  DatedValue dateVal = event_list.at(event->idx);
+
+  if (event->idx < event_list.size() - 1) {
+    fes_->add_event(event_date + dateVal.date_, event);
+    event->idx++;
+  } else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */
+    fes_->add_event(event_date + dateVal.date_, event);
+    event->idx = 1; /* idx=0 is a placeholder to store when events really start */
+  } else {          /* If we don't loop, we don't need this event anymore */
+    event->free_me = true;
+  }
+
+  return dateVal;
+}
+
+Profile* Profile::from_string(const std::string& name, const std::string& input, double periodicity)
 {
   int linecount                                    = 0;
   simgrid::kernel::profile::Profile* profile       = new simgrid::kernel::profile::Profile();
@@ -62,8 +100,8 @@ Profile* Profile::from_string(std::string name, std::string input, double period
     if (sscanf(val.c_str(), "LOOPAFTER %lg\n", &periodicity) == 1)
       continue;
 
-    xbt_assert(sscanf(val.c_str(), "%lg  %lg\n", &event.date_, &event.value_) == 2, "%s:%d: Syntax error in trace\n%s",
-               name.c_str(), linecount, input.c_str());
+    XBT_ATTRIB_UNUSED int res = sscanf(val.c_str(), "%lg  %lg\n", &event.date_, &event.value_);
+    xbt_assert(res == 2, "%s:%d: Syntax error in trace\n%s", name.c_str(), linecount, input.c_str());
 
     xbt_assert(last_event->date_ <= event.date_,
                "%s:%d: Invalid trace: Events must be sorted, but time %g > time %g.\n%s", name.c_str(), linecount,
@@ -85,7 +123,7 @@ Profile* Profile::from_string(std::string name, std::string input, double period
 
   return profile;
 }
-Profile* Profile::from_file(std::string path)
+Profile* Profile::from_file(const std::string& path)
 {
   xbt_assert(not path.empty(), "Cannot parse a trace from an empty filename");
   xbt_assert(trace_list.find(path) == trace_list.end(), "Refusing to define trace %s twice", path.c_str());
@@ -108,23 +146,13 @@ FutureEvtSet::~FutureEvtSet()
   }
 }
 
-/** @brief Registers a new trace into the future event set, and get an iterator over the integrated trace  */
-Event* FutureEvtSet::add_trace(Profile* profile, resource::Resource* resource)
+/** @brief Schedules an event to a future date */
+void FutureEvtSet::add_event(double date, Event* evt)
 {
-  Event* event    = new Event();
-  event->profile  = profile;
-  event->idx      = 0;
-  event->resource = resource;
-  event->free_me  = false;
-
-  xbt_assert((event->idx < profile->event_list.size()), "Your profile should have at least one event!");
-
-  heap_.emplace(0.0 /* start time */, event);
-
-  return event;
+  heap_.emplace(date, evt);
 }
 
-/** @brief returns the date of the next occurring event */
+/** @brief returns the date of the next occurring event (or -1 if empty) */
 double FutureEvtSet::next_date() const
 {
   return heap_.empty() ? -1.0 : heap_.top().first;
@@ -134,30 +162,17 @@ double FutureEvtSet::next_date() const
 Event* FutureEvtSet::pop_leq(double date, double* value, resource::Resource** resource)
 {
   double event_date = next_date();
-  if (event_date > date)
+  if (event_date > date || heap_.empty())
     return nullptr;
 
-  if (heap_.empty())
-    return nullptr;
   Event* event = heap_.top().second;
-  heap_.pop();
-
   Profile* profile = event->profile;
-  *resource        = event->resource;
-
-  DatedValue dateVal = profile->event_list.at(event->idx);
+  DatedValue dateVal = profile->next(event);
 
+  *resource = event->resource;
   *value = dateVal.value_;
 
-  if (event->idx < profile->event_list.size() - 1) {
-    heap_.emplace(event_date + dateVal.date_, event);
-    event->idx++;
-  } else if (dateVal.date_ > 0) { /* Last element. Shall we loop? */
-    heap_.emplace(event_date + dateVal.date_, event);
-    event->idx = 1; /* idx=0 is a placeholder to store when events really start */
-  } else {          /* If we don't loop, we don't need this event anymore */
-    event->free_me = true;
-  }
+  heap_.pop();
 
   return event;
 }