Misc code simplifications guided by Sonar smells.

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

diff --git a/src/kernel/resource/profile/Profile.cpp b/src/kernel/resource/profile/Profile.cpp
index 5a2ab185ae0e707740c15b1226f9021c759ec86c..bc45ead1f36fb247bcbb02cd4e3900d5b4d5d153 100644 (file)
--- a/src/kernel/resource/profile/Profile.cpp
+++ b/src/kernel/resource/profile/Profile.cpp
@@ -38,15 +38,11 @@ Event* Profile::schedule(FutureEvtSet* fes, resource::Resource* resource)
 
   fes_ = fes;
 
-  if(event_list.empty())
-    cb(event_list);
-
-  if(event_list.empty()) {
-    event->free_me  = false;
-  } else {
-    //FIXME: This is a bug, but keep old behaviour for now
-    //fes_->add_event(0, event);
+  if (get_enough_events(0)) {
     fes_->add_event(event_list[0].date_, event);
+  } else {
+    event->free_me  = true;
+    tmgr_trace_event_unref(&event);
   }
   return event;
 }
@@ -60,23 +56,23 @@ DatedValue Profile::next(Event* event)
 
   event->idx++;
 
-  if (event->idx == event_list.size())
-    cb(event_list);
-  if(event->idx>=event_list.size())
-    event->free_me = true;
-  else {
-    DatedValue& nextDateVal=event_list.at(event->idx);
+  if (get_enough_events(event->idx)) {
+    const DatedValue& nextDateVal = event_list[event->idx];
     xbt_assert(nextDateVal.date_>=0);
     xbt_assert(nextDateVal.value_>=0);
     fes_->add_event(event_date +nextDateVal.date_, event);
+  } else {
+    event->free_me = true;
   }
   return dateVal;
 }
 
-Profile::Profile(const std::string& name, const std::function<ProfileBuilder::UpdateCb>& cb, double repeat_delay): name(name),cb(std::move(cb)),repeat_delay(repeat_delay) {
+Profile::Profile(const std::string& name, const std::function<ProfileBuilder::UpdateCb>& cb, double repeat_delay)
+    : name(name), cb(cb), repeat_delay(repeat_delay)
+{
   xbt_assert(trace_list.find(name) == trace_list.end(), "Refusing to define trace %s twice", name.c_str());
-  trace_list.insert({name,this});
-  cb(event_list);
+  trace_list.try_emplace(name, this);
+  get_enough_events(0);
 }
 
 } // namespace profile
@@ -85,8 +81,8 @@ Profile::Profile(const std::string& name, const std::function<ProfileBuilder::Up
 
 void tmgr_finalize()
 {
-  for (auto const& kv : trace_list)
-    delete kv.second;
+  for (auto const& [_, trace] : trace_list)
+    delete trace;
   trace_list.clear();
 }