X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1857a20fd06ac10cf352dd0d7757ce63882c015..2db0630d598bd5bf5daa239297202b85e8ff0813:/src/kernel/resource/Action.cpp

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 44f57cee64..39825370df 100644
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -38,7 +38,7 @@ Action::~Action()
     get_model()->get_maxmin_system()->variable_free(get_variable());
 
   /* remove from heap on need (ie, if selective update) */
-  heapRemove();
+  get_model()->get_action_heap().remove(this);
   if (modified_set_hook_.is_linked())
     simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
 
@@ -100,8 +100,8 @@ void Action::set_bound(double bound)
   if (variable_)
     get_model()->get_maxmin_system()->update_variable_bound(variable_, bound);
 
-  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy && get_last_update() != surf_get_clock())
-    heapRemove();
+  if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy && get_last_update() != surf_get_clock())
+    get_model()->get_action_heap().remove(this);
   XBT_OUT();
 }
 
@@ -118,8 +118,8 @@ void Action::ref()
 void Action::set_max_duration(double duration)
 {
   max_duration_ = duration;
-  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) // remove action from the heap
-    heapRemove();
+  if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) // remove action from the heap
+    get_model()->get_action_heap().remove(this);
 }
 
 void Action::set_priority(double weight)
@@ -128,18 +128,18 @@ void Action::set_priority(double weight)
   sharing_priority_ = weight;
   get_model()->get_maxmin_system()->update_variable_weight(get_variable(), weight);
 
-  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy)
-    heapRemove();
+  if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy)
+    get_model()->get_action_heap().remove(this);
   XBT_OUT();
 }
 
 void Action::cancel()
 {
   set_state(Action::State::failed);
-  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) {
+  if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) {
     if (modified_set_hook_.is_linked())
       simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
-    heapRemove();
+    get_model()->get_action_heap().remove(this);
   }
 }
 
@@ -158,8 +158,8 @@ void Action::suspend()
   XBT_IN("(%p)", this);
   if (suspended_ != SuspendStates::sleeping) {
     get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
-    if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) {
-      heapRemove();
+    if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) {
+      get_model()->get_action_heap().remove(this);
       if (state_set_ == get_model()->get_running_action_set() && sharing_priority_ > 0) {
         // If we have a lazy model, we need to update the remaining value accordingly
         update_remains_lazy(surf_get_clock());
@@ -176,8 +176,8 @@ void Action::resume()
   if (suspended_ != SuspendStates::sleeping) {
     get_model()->get_maxmin_system()->update_variable_weight(get_variable(), get_priority());
     suspended_ = SuspendStates::not_suspended;
-    if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy)
-      heapRemove();
+    if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy)
+      get_model()->get_action_heap().remove(this);
   }
   XBT_OUT();
 }
@@ -186,43 +186,12 @@ bool Action::is_suspended()
 {
   return suspended_ == SuspendStates::suspended;
 }
-/* insert action on heap using a given key and a hat (heap_action_type)
- * a hat can be of three types for communications:
- *
- * NORMAL = this is a normal heap entry stating the date to finish transmitting
- * LATENCY = this is a heap entry to warn us when the latency is payed
- * MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
- */
-void Action::heapInsert(double key, Action::Type hat)
-{
-  type_       = hat;
-  heap_hook_  = get_model()->getActionHeap().emplace(std::make_pair(key, this));
-}
-
-void Action::heapRemove()
-{
-  type_ = Action::Type::NOTSET;
-  if (heap_hook_) {
-    get_model()->getActionHeap().erase(*heap_hook_);
-    clearHeapHandle();
-  }
-}
-
-void Action::heapUpdate(double key, Action::Type hat)
-{
-  type_ = hat;
-  if (heap_hook_) {
-    get_model()->getActionHeap().update(*heap_hook_, std::make_pair(key, this));
-  } else {
-    heap_hook_ = get_model()->getActionHeap().emplace(std::make_pair(key, this));
-  }
-}
 
 double Action::get_remains()
 {
   XBT_IN("(%p)", this);
   /* update remains before return it */
-  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) /* update remains before return it */
+  if (get_model()->get_update_algorithm() == Model::UpdateAlgo::Lazy) /* update remains before return it */
     update_remains_lazy(surf_get_clock());
   XBT_OUT();
   return remains_;
@@ -242,6 +211,40 @@ void Action::set_last_update()
   last_update_ = surf_get_clock();
 }
 
+double ActionHeap::top_date() const
+{
+  return top().first;
+}
+void ActionHeap::insert(Action* action, double date, ActionHeap::Type type)
+{
+  action->type_      = type;
+  action->heap_hook_ = emplace(std::make_pair(date, action));
+}
+void ActionHeap::remove(Action* action)
+{
+  action->type_ = ActionHeap::Type::unset;
+  if (action->heap_hook_) {
+    erase(*action->heap_hook_);
+    action->heap_hook_ = boost::none;
+  }
+}
+void ActionHeap::update(Action* action, double date, ActionHeap::Type type)
+{
+  action->type_ = type;
+  if (action->heap_hook_) {
+    heap_type::update(*action->heap_hook_, std::make_pair(date, action));
+  } else {
+    action->heap_hook_ = emplace(std::make_pair(date, action));
+  }
+}
+Action* ActionHeap::pop()
+{
+  Action* action = top().second;
+  heap_type::pop();
+  action->heap_hook_ = boost::none;
+  return action;
+}
+
 } // namespace surf
 } // namespace simgrid
 } // namespace simgrid