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

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 4281441afb..9e64d25dad 100644
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -23,15 +23,26 @@ Action::Action(simgrid::kernel::resource::Model* model, double cost, bool failed
     : remains_(cost), start_time_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
 {
   if (failed)
-    state_set_ = getModel()->getFailedActionSet();
+    state_set_ = get_model()->get_failed_action_set();
   else
-    state_set_ = getModel()->getRunningActionSet();
+    state_set_ = get_model()->get_running_action_set();
 
   state_set_->push_back(*this);
 }
 
 Action::~Action()
 {
+  if (state_set_hook_.is_linked())
+    simgrid::xbt::intrusive_erase(*state_set_, *this);
+  if (get_variable())
+    get_model()->get_maxmin_system()->variable_free(get_variable());
+  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) {
+    /* remove from heap */
+    heapRemove();
+    if (modified_set_hook_.is_linked())
+      simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
+  }
+
   xbt_free(category_);
 }
 
@@ -39,17 +50,18 @@ void Action::finish(Action::State state)
 {
   finish_time_ = surf_get_clock();
   set_state(state);
+  set_remains(0);
 }
 
 Action::State Action::get_state() const
 {
-  if (state_set_ == model_->getReadyActionSet())
+  if (state_set_ == model_->get_ready_action_set())
     return Action::State::ready;
-  if (state_set_ == model_->getRunningActionSet())
+  if (state_set_ == model_->get_running_action_set())
     return Action::State::running;
-  if (state_set_ == model_->getFailedActionSet())
+  if (state_set_ == model_->get_failed_action_set())
     return Action::State::failed;
-  if (state_set_ == model_->getDoneActionSet())
+  if (state_set_ == model_->get_done_action_set())
     return Action::State::done;
   return Action::State::not_in_the_system;
 }
@@ -59,16 +71,16 @@ void Action::set_state(Action::State state)
   simgrid::xbt::intrusive_erase(*state_set_, *this);
   switch (state) {
     case Action::State::ready:
-      state_set_ = model_->getReadyActionSet();
+      state_set_ = model_->get_ready_action_set();
       break;
     case Action::State::running:
-      state_set_ = model_->getRunningActionSet();
+      state_set_ = model_->get_running_action_set();
       break;
     case Action::State::failed:
-      state_set_ = model_->getFailedActionSet();
+      state_set_ = model_->get_failed_action_set();
       break;
     case Action::State::done:
-      state_set_ = model_->getDoneActionSet();
+      state_set_ = model_->get_done_action_set();
       break;
     default:
       state_set_ = nullptr;
@@ -87,14 +99,14 @@ void Action::set_bound(double bound)
 {
   XBT_IN("(%p,%g)", this, bound);
   if (variable_)
-    getModel()->getMaxminSystem()->update_variable_bound(variable_, bound);
+    get_model()->get_maxmin_system()->update_variable_bound(variable_, bound);
 
-  if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate() != surf_get_clock())
-    heapRemove(getModel()->getActionHeap());
+  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy && get_last_update() != surf_get_clock())
+    heapRemove();
   XBT_OUT();
 }
 
-void Action::setCategory(const char* category)
+void Action::set_category(const char* category)
 {
   category_ = xbt_strdup(category);
 }
@@ -104,31 +116,31 @@ void Action::ref()
   refcount_++;
 }
 
-void Action::setMaxDuration(double duration)
+void Action::set_max_duration(double duration)
 {
   max_duration_ = duration;
-  if (getModel()->getUpdateMechanism() == UM_LAZY) // remove action from the heap
-    heapRemove(getModel()->getActionHeap());
+  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) // remove action from the heap
+    heapRemove();
 }
 
-void Action::setSharingWeight(double weight)
+void Action::set_priority(double weight)
 {
   XBT_IN("(%p,%g)", this, weight);
-  sharing_weight_ = weight;
-  getModel()->getMaxminSystem()->update_variable_weight(getVariable(), weight);
+  sharing_priority_ = weight;
+  get_model()->get_maxmin_system()->update_variable_weight(get_variable(), weight);
 
-  if (getModel()->getUpdateMechanism() == UM_LAZY)
-    heapRemove(getModel()->getActionHeap());
+  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy)
+    heapRemove();
   XBT_OUT();
 }
 
 void Action::cancel()
 {
   set_state(Action::State::failed);
-  if (getModel()->getUpdateMechanism() == UM_LAZY) {
+  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) {
     if (modified_set_hook_.is_linked())
-      simgrid::xbt::intrusive_erase(*getModel()->getModifiedSet(), *this);
-    heapRemove(getModel()->getActionHeap());
+      simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
+    heapRemove();
   }
 }
 
@@ -136,16 +148,6 @@ int Action::unref()
 {
   refcount_--;
   if (not refcount_) {
-    if (state_set_hook_.is_linked())
-      simgrid::xbt::intrusive_erase(*state_set_, *this);
-    if (getVariable())
-      getModel()->getMaxminSystem()->variable_free(getVariable());
-    if (getModel()->getUpdateMechanism() == UM_LAZY) {
-      /* remove from heap */
-      heapRemove(getModel()->getActionHeap());
-      if (modified_set_hook_.is_linked())
-        simgrid::xbt::intrusive_erase(*getModel()->getModifiedSet(), *this);
-    }
     delete this;
     return 1;
   }
@@ -156,13 +158,12 @@ void Action::suspend()
 {
   XBT_IN("(%p)", this);
   if (suspended_ != SuspendStates::sleeping) {
-    getModel()->getMaxminSystem()->update_variable_weight(getVariable(), 0.0);
-    if (getModel()->getUpdateMechanism() == UM_LAZY) {
-      heapRemove(getModel()->getActionHeap());
-      if (getModel()->getUpdateMechanism() == UM_LAZY && state_set_ == getModel()->getRunningActionSet() &&
-          sharing_weight_ > 0) {
+    get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.0);
+    if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) {
+      heapRemove();
+      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
-        updateRemainingLazy(surf_get_clock());
+        update_remains_lazy(surf_get_clock());
       }
     }
     suspended_ = SuspendStates::suspended;
@@ -174,15 +175,15 @@ void Action::resume()
 {
   XBT_IN("(%p)", this);
   if (suspended_ != SuspendStates::sleeping) {
-    getModel()->getMaxminSystem()->update_variable_weight(getVariable(), getPriority());
+    get_model()->get_maxmin_system()->update_variable_weight(get_variable(), get_priority());
     suspended_ = SuspendStates::not_suspended;
-    if (getModel()->getUpdateMechanism() == UM_LAZY)
-      heapRemove(getModel()->getActionHeap());
+    if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy)
+      heapRemove();
   }
   XBT_OUT();
 }
 
-bool Action::isSuspended()
+bool Action::is_suspended()
 {
   return suspended_ == SuspendStates::suspended;
 }
@@ -193,51 +194,51 @@ bool Action::isSuspended()
  * 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(heap_type& heap, double key, Action::Type hat)
+void Action::heapInsert(double key, Action::Type hat)
 {
   type_       = hat;
-  heap_handle_ = heap.emplace(std::make_pair(key, this));
+  heap_hook_  = get_model()->getActionHeap().emplace(std::make_pair(key, this));
 }
 
-void Action::heapRemove(heap_type& heap)
+void Action::heapRemove()
 {
   type_ = Action::Type::NOTSET;
-  if (heap_handle_) {
-    heap.erase(*heap_handle_);
+  if (heap_hook_) {
+    get_model()->getActionHeap().erase(*heap_hook_);
     clearHeapHandle();
   }
 }
 
-void Action::heapUpdate(heap_type& heap, double key, Action::Type hat)
+void Action::heapUpdate(double key, Action::Type hat)
 {
   type_ = hat;
-  if (heap_handle_) {
-    heap.update(*heap_handle_, std::make_pair(key, this));
+  if (heap_hook_) {
+    get_model()->getActionHeap().update(*heap_hook_, std::make_pair(key, this));
   } else {
-    heap_handle_ = heap.emplace(std::make_pair(key, this));
+    heap_hook_ = get_model()->getActionHeap().emplace(std::make_pair(key, this));
   }
 }
 
-double Action::getRemains()
+double Action::get_remains()
 {
   XBT_IN("(%p)", this);
   /* update remains before return it */
-  if (getModel()->getUpdateMechanism() == UM_LAZY) /* update remains before return it */
-    updateRemainingLazy(surf_get_clock());
+  if (get_model()->getUpdateMechanism() == Model::UpdateAlgo::Lazy) /* update remains before return it */
+    update_remains_lazy(surf_get_clock());
   XBT_OUT();
   return remains_;
 }
 
-void Action::updateMaxDuration(double delta)
+void Action::update_max_duration(double delta)
 {
   double_update(&max_duration_, delta, sg_surf_precision);
 }
-void Action::updateRemains(double delta)
+void Action::update_remains(double delta)
 {
   double_update(&remains_, delta, sg_maxmin_precision * sg_surf_precision);
 }
 
-void Action::refreshLastUpdate()
+void Action::set_last_update()
 {
   last_update_ = surf_get_clock();
 }