Action::finish() is never used without setState().

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

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index c1750d7..b3d5bea 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -129,8 +129,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) {
 
     if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
         ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {
 
     if (((action->getRemains() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) ||
         ((action->getMaxDuration() > NO_MAX_DURATION) && (action->getMaxDuration() <= 0))) {

-      action->finish();
-      action->setState(Action::State::done);
+      action->finish(Action::State::done);

     } else {
       /* Need to check that none of the model has failed */
       int i = 0;
     } else {
       /* Need to check that none of the model has failed */
       int i = 0;


@@ -140,8 +139,7 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) {
         void *constraint_id = lmm_constraint_id(cnst);
         if (static_cast<simgrid::surf::Resource*>(constraint_id)->isOff()) {
           XBT_DEBUG("Action (%p) Failed!!", action);
         void *constraint_id = lmm_constraint_id(cnst);
         if (static_cast<simgrid::surf::Resource*>(constraint_id)->isOff()) {
           XBT_DEBUG("Action (%p) Failed!!", action);

-          action->finish();
-          action->setState(Action::State::failed);
+          action->finish(Action::State::failed);

           break;
         }
         cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);
           break;
         }
         cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i);