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

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 391ccd3b5b..a74efb5b1f 100644
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -47,8 +47,8 @@ Action::~Action()
 void Action::finish(Action::State state)
 {
   finish_time_ = surf_get_clock();
-  set_state(state);
   set_remains(0);
+  set_state(state);
 }
 
 Action::State Action::get_state() const
@@ -121,11 +121,11 @@ void Action::set_max_duration(double duration)
     get_model()->get_action_heap().remove(this);
 }
 
-void Action::set_priority(double weight)
+void Action::set_sharing_penalty(double sharing_penalty)
 {
-  XBT_IN("(%p,%g)", this, weight);
-  sharing_priority_ = weight;
-  get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 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 (get_model()->get_update_algorithm() == Model::UpdateAlgo::LAZY)
     get_model()->get_action_heap().remove(this);
@@ -155,16 +155,16 @@ bool Action::unref()
 void Action::suspend()
 {
   XBT_IN("(%p)", this);
-  if (suspended_ != SuspendStates::sleeping) {
-    get_model()->get_maxmin_system()->update_variable_weight(get_variable(), 0.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_priority_ > 0) {
+      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
         update_remains_lazy(surf_get_clock());
       }
     }
-    suspended_ = SuspendStates::suspended;
+    suspended_ = SuspendStates::SUSPENDED;
   }
   XBT_OUT();
 }
@@ -172,20 +172,15 @@ void Action::suspend()
 void Action::resume()
 {
   XBT_IN("(%p)", this);
-  if (suspended_ != SuspendStates::sleeping) {
-    get_model()->get_maxmin_system()->update_variable_weight(get_variable(), get_priority());
-    suspended_ = SuspendStates::not_suspended;
+  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::is_suspended()
-{
-  return suspended_ == SuspendStates::suspended;
-}
-
 double Action::get_remains()
 {
   XBT_IN("(%p)", this);
@@ -198,7 +193,8 @@ double Action::get_remains()
 
 void Action::update_max_duration(double delta)
 {
-  double_update(&max_duration_, delta, sg_surf_precision);
+  if (max_duration_ != NO_MAX_DURATION)
+    double_update(&max_duration_, delta, sg_surf_precision);
 }
 void Action::update_remains(double delta)
 {
@@ -244,6 +240,6 @@ Action* ActionHeap::pop()
   return action;
 }
 
-} // namespace surf
+} // namespace resource
 } // namespace kernel
 } // namespace simgrid