X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8372ae97612f27b84e8d75aeeed9de0ba6d2ba6a..961f84a35b1b94b8f3a1bfec1e5017d1f8de831b:/src/kernel/resource/Model.cpp

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index ee43169796..43577140af 100644
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -13,41 +13,31 @@ namespace kernel {
 namespace resource {
 
 Model::Model(Model::UpdateAlgo algo) : update_algorithm_(algo) {}
+Model::~Model() = default;
 
-Model::~Model()
+Action::ModifiedSet* Model::get_modified_set() const
 {
-  delete ready_action_set_;
-  delete running_action_set_;
-  delete failed_action_set_;
-  delete done_action_set_;
-  delete maxmin_system_;
+  return maxmin_system_->modified_set_;
 }
 
-Action* Model::actionHeapPop()
+void Model::set_maxmin_system(lmm::System* system)
 {
-  Action* action = action_heap_.top().second;
-  action_heap_.pop();
-  action->clearHeapHandle();
-  return action;
+  maxmin_system_.release(); // ugly...
+  maxmin_system_.reset(system);
 }
 
-Action::ModifiedSet* Model::get_modified_set() const
-{
-  return maxmin_system_->modified_set_;
-}
-
-double Model::next_occuring_event(double now)
+double Model::next_occurring_event(double now)
 {
   // FIXME: set the good function once and for all
-  if (update_algorithm_ == Model::UpdateAlgo::Lazy)
-    return next_occuring_event_lazy(now);
-  else if (update_algorithm_ == Model::UpdateAlgo::Full)
-    return next_occuring_event_full(now);
+  if (update_algorithm_ == Model::UpdateAlgo::LAZY)
+    return next_occurring_event_lazy(now);
+  else if (update_algorithm_ == Model::UpdateAlgo::FULL)
+    return next_occurring_event_full(now);
   else
     xbt_die("Invalid cpu update mechanism!");
 }
 
-double Model::next_occuring_event_lazy(double now)
+double Model::next_occurring_event_lazy(double now)
 {
   XBT_DEBUG("Before share resources, the size of modified actions set is %zu", maxmin_system_->modified_set_->size());
   maxmin_system_->lmm_solve();
@@ -58,11 +48,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_sharing_penalty() <= 0 || action->get_type() == ActionHeap::Type::latency)
       continue;
 
     action->update_remains_lazy(now);
@@ -80,28 +70,28 @@ double Model::next_occuring_event_lazy(double now)
       min = now + time_to_completion; // when the task will complete if nothing changes
     }
 
-    if ((action->get_max_duration() > NO_MAX_DURATION) &&
+    if ((action->get_max_duration() != NO_MAX_DURATION) &&
         (min <= -1 || action->get_start_time() + action->get_max_duration() < min)) {
       // when the task will complete anyway because of the deadline if any
       min          = action->get_start_time() + action->get_max_duration();
       max_duration_flag = true;
     }
 
-    XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->get_variable()->id_int);
+    XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->get_variable()->rank_);
 
     XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action,
               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 {
@@ -110,13 +100,13 @@ double Model::next_occuring_event_lazy(double now)
   }
 }
 
-double Model::next_occuring_event_full(double /*now*/)
+double Model::next_occurring_event_full(double /*now*/)
 {
   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,14 +130,36 @@ double Model::next_occuring_event_full(double /*now*/)
 
 void Model::update_actions_state(double now, double delta)
 {
-  if (update_algorithm_ == Model::UpdateAlgo::Full)
+  if (update_algorithm_ == Model::UpdateAlgo::FULL)
     update_actions_state_full(now, delta);
-  else if (update_algorithm_ == Model::UpdateAlgo::Lazy)
+  else if (update_algorithm_ == Model::UpdateAlgo::LAZY)
     update_actions_state_lazy(now, delta);
   else
     xbt_die("Invalid cpu update mechanism!");
 }
 
+/** Pops and returns the first action of that state set (or nullptr if none exist) */
+Action* Model::extract_action(Action::StateSet* list)
+{
+  if (list->empty())
+    return nullptr;
+  simgrid::kernel::resource::Action* res = &list->front();
+  list->pop_front();
+  return res;
+}
+
+/** Pops and returns the first finished action (or nullptr if none exist) */
+Action* Model::extract_done_action()
+{
+  return extract_action(get_finished_action_set());
+}
+
+/** Pops and returns the failed finished action (or nullptr if none exist) */
+Action* Model::extract_failed_action()
+{
+  return extract_action(get_failed_action_set());
+}
+
 void Model::update_actions_state_lazy(double /*now*/, double /*delta*/)
 {
   THROW_UNIMPLEMENTED;
@@ -158,6 +170,6 @@ void Model::update_actions_state_full(double /*now*/, double /*delta*/)
   THROW_UNIMPLEMENTED;
 }
 
-} // namespace surf
-} // namespace simgrid
+} // namespace resource
+} // namespace kernel
 } // namespace simgrid