X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f50aa3d0ce380b0f9bcd5a217c5015e6bd3db18..281053ec9111f89a48c64f603cda926b9f6912af:/src/kernel/resource/Model.cpp

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index 25a3ee6bb9..63e662a208 100644
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -12,25 +12,18 @@ namespace simgrid {
 namespace kernel {
 namespace resource {
 
-Model::Model() = default;
+Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
 
 Model::~Model()
 {
-  delete ready_action_set_;
-  delete running_action_set_;
+  delete inited_action_set_;
+  delete started_action_set_;
   delete failed_action_set_;
-  delete done_action_set_;
+  delete finished_action_set_;
+  delete ignored_action_set_;
   delete maxmin_system_;
 }
 
-Action* Model::actionHeapPop()
-{
-  Action* action = action_heap_.top().second;
-  action_heap_.pop();
-  action->clearHeapHandle();
-  return action;
-}
-
 Action::ModifiedSet* Model::get_modified_set() const
 {
   return maxmin_system_->modified_set_;
@@ -39,9 +32,9 @@ Action::ModifiedSet* Model::get_modified_set() const
 double Model::next_occuring_event(double now)
 {
   // FIXME: set the good function once and for all
-  if (update_mechanism_ == UM_LAZY)
+  if (update_algorithm_ == Model::UpdateAlgo::Lazy)
     return next_occuring_event_lazy(now);
-  else if (update_mechanism_ == UM_FULL)
+  else if (update_algorithm_ == Model::UpdateAlgo::Full)
     return next_occuring_event_full(now);
   else
     xbt_die("Invalid cpu update mechanism!");
@@ -50,7 +43,7 @@ double Model::next_occuring_event(double now)
 double Model::next_occuring_event_lazy(double now)
 {
   XBT_DEBUG("Before share resources, the size of modified actions set is %zu", maxmin_system_->modified_set_->size());
-  lmm_solve(maxmin_system_);
+  maxmin_system_->lmm_solve();
   XBT_DEBUG("After share resources, The size of modified actions set is %zu", maxmin_system_->modified_set_->size());
 
   while (not maxmin_system_->modified_set_->empty()) {
@@ -58,11 +51,11 @@ double Model::next_occuring_event_lazy(double now)
     maxmin_system_->modified_set_->pop_front();
     bool max_duration_flag = false;
 
-    if (action->get_state_set() != running_action_set_)
+    if (action->get_state_set() != started_action_set_)
       continue;
 
     /* bogus priority, skip it */
-    if (action->get_priority() <= 0 || action->get_type() == Action::Type::LATENCY)
+    if (action->get_priority() <= 0 || action->get_type() == ActionHeap::Type::latency)
       continue;
 
     action->update_remains_lazy(now);
@@ -93,15 +86,15 @@ double Model::next_occuring_event_lazy(double now)
               action->get_start_time(), min, share, action->get_max_duration());
 
     if (min > -1) {
-      action->heapUpdate(min, max_duration_flag ? Action::Type::MAX_DURATION : Action::Type::NORMAL);
+      action_heap_.update(action, min, max_duration_flag ? ActionHeap::Type::max_duration : ActionHeap::Type::normal);
       XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now);
     } else
       DIE_IMPOSSIBLE;
   }
 
   // hereafter must have already the min value for this resource model
-  if (not actionHeapIsEmpty()) {
-    double min = actionHeapTopDate() - now;
+  if (not action_heap_.empty()) {
+    double min = action_heap_.top_date() - now;
     XBT_DEBUG("minimum with the HEAP %f", min);
     return min;
   } else {
@@ -112,11 +105,11 @@ double Model::next_occuring_event_lazy(double now)
 
 double Model::next_occuring_event_full(double /*now*/)
 {
-  maxmin_system_->solve_fun(maxmin_system_);
+  maxmin_system_->solve();
 
   double min = -1;
 
-  for (Action& action : *get_running_action_set()) {
+  for (Action& action : *get_started_action_set()) {
     double value = action.get_variable()->get_value();
     if (value > 0) {
       if (action.get_remains() > 0)
@@ -140,9 +133,9 @@ double Model::next_occuring_event_full(double /*now*/)
 
 void Model::update_actions_state(double now, double delta)
 {
-  if (update_mechanism_ == UM_FULL)
+  if (update_algorithm_ == Model::UpdateAlgo::Full)
     update_actions_state_full(now, delta);
-  else if (update_mechanism_ == UM_LAZY)
+  else if (update_algorithm_ == Model::UpdateAlgo::Lazy)
     update_actions_state_lazy(now, delta);
   else
     xbt_die("Invalid cpu update mechanism!");