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

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 4281441afb..a74efb5b1f 100644
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.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. */
@@ -7,6 +7,7 @@
 #include "simgrid/kernel/resource/Model.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
 
 XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
@@ -23,52 +24,66 @@ 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_started_action_set();
 
   state_set_->push_back(*this);
 }
 
 Action::~Action()
 {
-  xbt_free(category_);
+  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());
+
+  /* remove from heap on need (ie, if selective update) */
+  get_model()->get_action_heap().remove(this);
+  if (modified_set_hook_.is_linked())
+    simgrid::xbt::intrusive_erase(*get_model()->get_modified_set(), *this);
 }
 
 void Action::finish(Action::State state)
 {
   finish_time_ = surf_get_clock();
+  set_remains(0);
   set_state(state);
 }
 
 Action::State Action::get_state() const
 {
-  if (state_set_ == model_->getReadyActionSet())
-    return Action::State::ready;
-  if (state_set_ == model_->getRunningActionSet())
-    return Action::State::running;
-  if (state_set_ == model_->getFailedActionSet())
-    return Action::State::failed;
-  if (state_set_ == model_->getDoneActionSet())
-    return Action::State::done;
-  return Action::State::not_in_the_system;
+  if (state_set_ == model_->get_inited_action_set())
+    return Action::State::INITED;
+  if (state_set_ == model_->get_started_action_set())
+    return Action::State::STARTED;
+  if (state_set_ == model_->get_failed_action_set())
+    return Action::State::FAILED;
+  if (state_set_ == model_->get_finished_action_set())
+    return Action::State::FINISHED;
+  if (state_set_ == model_->get_ignored_action_set())
+    return Action::State::IGNORED;
+  THROW_IMPOSSIBLE;
 }
 
 void Action::set_state(Action::State state)
 {
   simgrid::xbt::intrusive_erase(*state_set_, *this);
   switch (state) {
-    case Action::State::ready:
-      state_set_ = model_->getReadyActionSet();
+    case Action::State::INITED:
+      state_set_ = model_->get_inited_action_set();
+      break;
+    case Action::State::STARTED:
+      state_set_ = model_->get_started_action_set();
       break;
-    case Action::State::running:
-      state_set_ = model_->getRunningActionSet();
+    case Action::State::FAILED:
+      state_set_ = model_->get_failed_action_set();
       break;
-    case Action::State::failed:
-      state_set_ = model_->getFailedActionSet();
+    case Action::State::FINISHED:
+      state_set_ = model_->get_finished_action_set();
       break;
-    case Action::State::done:
-      state_set_ = model_->getDoneActionSet();
+    case Action::State::IGNORED:
+      state_set_ = model_->get_ignored_action_set();
       break;
     default:
       state_set_ = nullptr;
@@ -87,85 +102,69 @@ 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()->get_update_algorithm() == Model::UpdateAlgo::LAZY && get_last_update() != surf_get_clock())
+    get_model()->get_action_heap().remove(this);
   XBT_OUT();
 }
 
-void Action::setCategory(const char* category)
-{
-  category_ = xbt_strdup(category);
-}
-
 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()->get_update_algorithm() == Model::UpdateAlgo::LAZY) // remove action from the heap
+    get_model()->get_action_heap().remove(this);
 }
 
-void Action::setSharingWeight(double weight)
+void Action::set_sharing_penalty(double sharing_penalty)
 {
-  XBT_IN("(%p,%g)", this, weight);
-  sharing_weight_ = weight;
-  getModel()->getMaxminSystem()->update_variable_weight(getVariable(), weight);
+  XBT_IN("(%p,%g)", this, sharing_penalty);
+  sharing_penalty_ = sharing_penalty;
+  get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), sharing_penalty);
 
-  if (getModel()->getUpdateMechanism() == UM_LAZY)
-    heapRemove(getModel()->getActionHeap());
+  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 (getModel()->getUpdateMechanism() == UM_LAZY) {
+  set_state(Action::State::FAILED);
+  if (get_model()->get_update_algorithm() == 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);
+    get_model()->get_action_heap().remove(this);
   }
 }
 
-int Action::unref()
+bool 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;
+    return true;
   }
-  return 0;
+  return false;
 }
 
 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) {
+  if (suspended_ != SuspendStates::SLEEPING) {
+    get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0);
+    if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY) {
+      get_model()->get_action_heap().remove(this);
+      if (state_set_ == get_model()->get_started_action_set() && sharing_penalty_ > 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;
+    suspended_ = SuspendStates::SUSPENDED;
   }
   XBT_OUT();
 }
@@ -173,75 +172,74 @@ void Action::suspend()
 void Action::resume()
 {
   XBT_IN("(%p)", this);
-  if (suspended_ != SuspendStates::sleeping) {
-    getModel()->getMaxminSystem()->update_variable_weight(getVariable(), getPriority());
-    suspended_ = SuspendStates::not_suspended;
-    if (getModel()->getUpdateMechanism() == UM_LAZY)
-      heapRemove(getModel()->getActionHeap());
+  if (suspended_ != SuspendStates::SLEEPING) {
+    get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), get_sharing_penalty());
+    suspended_ = SuspendStates::RUNNING;
+    if (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY)
+      get_model()->get_action_heap().remove(this);
   }
   XBT_OUT();
 }
 
-bool Action::isSuspended()
+double Action::get_remains()
 {
-  return suspended_ == SuspendStates::suspended;
+  XBT_IN("(%p)", this);
+  /* update remains before returning 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_;
 }
-/* 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(heap_type& heap, double key, Action::Type hat)
+
+void Action::update_max_duration(double delta)
 {
-  type_       = hat;
-  heap_handle_ = heap.emplace(std::make_pair(key, this));
+  if (max_duration_ != NO_MAX_DURATION)
+    double_update(&max_duration_, delta, sg_surf_precision);
 }
-
-void Action::heapRemove(heap_type& heap)
+void Action::update_remains(double delta)
 {
-  type_ = Action::Type::NOTSET;
-  if (heap_handle_) {
-    heap.erase(*heap_handle_);
-    clearHeapHandle();
-  }
+  double_update(&remains_, delta, sg_maxmin_precision * sg_surf_precision);
 }
 
-void Action::heapUpdate(heap_type& heap, double key, Action::Type hat)
+void Action::set_last_update()
 {
-  type_ = hat;
-  if (heap_handle_) {
-    heap.update(*heap_handle_, std::make_pair(key, this));
-  } else {
-    heap_handle_ = heap.emplace(std::make_pair(key, this));
-  }
+  last_update_ = surf_get_clock();
 }
 
-double Action::getRemains()
+double ActionHeap::top_date() const
 {
-  XBT_IN("(%p)", this);
-  /* update remains before return it */
-  if (getModel()->getUpdateMechanism() == UM_LAZY) /* update remains before return it */
-    updateRemainingLazy(surf_get_clock());
-  XBT_OUT();
-  return remains_;
+  return top().first;
 }
-
-void Action::updateMaxDuration(double delta)
+void ActionHeap::insert(Action* action, double date, ActionHeap::Type type)
 {
-  double_update(&max_duration_, delta, sg_surf_precision);
+  action->type_      = type;
+  action->heap_hook_ = emplace(std::make_pair(date, action));
 }
-void Action::updateRemains(double delta)
+void ActionHeap::remove(Action* action)
 {
-  double_update(&remains_, delta, sg_maxmin_precision * sg_surf_precision);
+  action->type_ = ActionHeap::Type::unset;
+  if (action->heap_hook_) {
+    erase(*action->heap_hook_);
+    action->heap_hook_ = boost::none;
+  }
 }
-
-void Action::refreshLastUpdate()
+void ActionHeap::update(Action* action, double date, ActionHeap::Type type)
 {
-  last_update_ = surf_get_clock();
+  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 resource
+} // namespace kernel
 } // namespace simgrid