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

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 63a7a1af3d..006295381e 100644
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -5,23 +5,21 @@
 
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/kernel/resource/Model.hpp"
+#include "src/kernel/EngineImpl.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");
+XBT_LOG_NEW_CATEGORY(kernel, "SimGrid internals");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_resource, kernel, "Resources, modeling the platform performance");
 
 namespace simgrid {
 namespace kernel {
 namespace resource {
 
-Action::Action(simgrid::kernel::resource::Model* model, double cost, bool failed) : Action(model, cost, failed, nullptr)
-{
-}
+Action::Action(Model* model, double cost, bool failed) : Action(model, cost, failed, nullptr) {}
 
-Action::Action(simgrid::kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var)
-    : remains_(cost), start_time_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
+Action::Action(Model* model, double cost, bool failed, lmm::Variable* var)
+    : remains_(cost), start_time_(EngineImpl::get_clock()), cost_(cost), model_(model), variable_(var)
 {
   if (failed)
     state_set_ = model_->get_failed_action_set();
@@ -34,19 +32,19 @@ Action::Action(simgrid::kernel::resource::Model* model, double cost, bool failed
 Action::~Action()
 {
   if (state_set_hook_.is_linked())
-    simgrid::xbt::intrusive_erase(*state_set_, *this);
+    xbt::intrusive_erase(*state_set_, *this);
   if (get_variable())
     model_->get_maxmin_system()->variable_free(get_variable());
 
   /* remove from heap on need (ie, if selective update) */
   model_->get_action_heap().remove(this);
   if (modified_set_hook_.is_linked())
-    simgrid::xbt::intrusive_erase(*model_->get_modified_set(), *this);
+    xbt::intrusive_erase(*model_->get_modified_set(), *this);
 }
 
 void Action::finish(Action::State state)
 {
-  finish_time_ = surf_get_clock();
+  finish_time_ = EngineImpl::get_clock();
   set_remains(0);
   set_state(state);
 }
@@ -68,7 +66,7 @@ Action::State Action::get_state() const
 
 void Action::set_state(Action::State state)
 {
-  simgrid::xbt::intrusive_erase(*state_set_, *this);
+  xbt::intrusive_erase(*state_set_, *this);
   switch (state) {
     case Action::State::INITED:
       state_set_ = model_->get_inited_action_set();
@@ -98,13 +96,18 @@ double Action::get_bound() const
   return variable_ ? variable_->get_bound() : 0;
 }
 
+double Action::get_rate() const
+{
+  return variable_ ? variable_->get_value() * factor_ : 0;
+}
+
 void Action::set_bound(double bound)
 {
   XBT_IN("(%p,%g)", this, bound);
   if (variable_)
     model_->get_maxmin_system()->update_variable_bound(variable_, bound);
 
-  if (model_->is_update_lazy() && get_last_update() != surf_get_clock())
+  if (model_->is_update_lazy() && get_last_update() != EngineImpl::get_clock())
     model_->get_action_heap().remove(this);
   XBT_OUT();
 }
@@ -126,7 +129,6 @@ void Action::set_sharing_penalty(double sharing_penalty)
   XBT_IN("(%p,%g)", this, sharing_penalty);
   sharing_penalty_ = sharing_penalty;
   model_->get_maxmin_system()->update_variable_penalty(get_variable(), sharing_penalty);
-
   if (model_->is_update_lazy())
     model_->get_action_heap().remove(this);
   XBT_OUT();
@@ -161,7 +163,7 @@ void Action::suspend()
       model_->get_action_heap().remove(this);
       if (state_set_ == model_->get_started_action_set() && sharing_penalty_ > 0) {
         // If we have a lazy model, we need to update the remaining value accordingly
-        update_remains_lazy(surf_get_clock());
+        update_remains_lazy(EngineImpl::get_clock());
       }
     }
     suspended_ = SuspendStates::SUSPENDED;
@@ -186,7 +188,7 @@ double Action::get_remains()
   XBT_IN("(%p)", this);
   /* update remains before returning it */
   if (model_->is_update_lazy()) /* update remains before return it */
-    update_remains_lazy(surf_get_clock());
+    update_remains_lazy(EngineImpl::get_clock());
   XBT_OUT();
   return remains_;
 }
@@ -204,7 +206,7 @@ void Action::update_remains(double delta)
 
 void Action::set_last_update()
 {
-  last_update_ = surf_get_clock();
+  last_update_ = EngineImpl::get_clock();
 }
 
 double ActionHeap::top_date() const