X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ba4150dcab4a65a59d4a85169ea668b04858108..82fd162ad0b5fc51a715b6e6e6df55bb52a18b44:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index a8a7239d2c..b0007c14e0 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -634,8 +634,10 @@ Action::~Action() { xbt_free(category_); } -void Action::finish() { +void Action::finish(Action::State state) +{ finishTime_ = surf_get_clock(); + setState(state); } Action::State Action::getState() @@ -880,8 +882,7 @@ void Action::updateRemainingLazy(double now) //FIXME: duplicated code if (((remains_ <= 0) && (lmm_get_variable_weight(getVariable()) > 0)) || ((maxDuration_ > NO_MAX_DURATION) && (maxDuration_ <= 0))) { - finish(); - setState(Action::State::done); + finish(Action::State::done); heapRemove(getModel()->getActionHeap()); } }