refactor: be explicit on what an action's priority is

[simgrid.git] / src / surf / surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 4bbbdfb..5011054 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -735,11 +735,11 @@ void Action::setMaxDuration(double duration)
 
 void Action::gapRemove() {}
 
-void Action::setPriority(double priority)
+void Action::setSharingWeight(double weight)
 {
-  XBT_IN("(%p,%g)", this, priority);
-  priority_ = priority;
-  lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority);
+  XBT_IN("(%p,%g)", this, weight);
+  sharingWeight_ = weight;
+  lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), weight);
 
   if (getModel()->getUpdateMechanism() == UM_LAZY)
     heapRemove(getModel()->getActionHeap());
@@ -781,7 +781,8 @@ void Action::suspend()
     lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
     if (getModel()->getUpdateMechanism() == UM_LAZY){
       heapRemove(getModel()->getActionHeap());
-      if (getModel()->getUpdateMechanism() == UM_LAZY  && stateSet_ == getModel()->getRunningActionSet() && priority_ > 0){
+      if (getModel()->getUpdateMechanism() == UM_LAZY && stateSet_ == getModel()->getRunningActionSet() &&
+          sharingWeight_ > 0) {
         //If we have a lazy model, we need to update the remaining value accordingly
         updateRemainingLazy(surf_get_clock());
       }
@@ -795,7 +796,7 @@ void Action::resume()
 {
   XBT_IN("(%p)", this);
   if (suspended_ != 2) {
-    lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority_);
+    lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), sharingWeight_);
     suspended_ = 0;
     if (getModel()->getUpdateMechanism() == UM_LAZY)
       heapRemove(getModel()->getActionHeap());
@@ -870,7 +871,7 @@ void Action::updateRemainingLazy(double now)
   else
   {
     xbt_assert(stateSet_ == getModel()->getRunningActionSet(), "You're updating an action that is not running.");
-    xbt_assert(priority_ > 0, "You're updating an action that seems suspended.");
+    xbt_assert(sharingWeight_ > 0, "You're updating an action that seems suspended.");
   }
 
   delta = now - lastUpdate_;