X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/377d2091c1e0f30ef48fb068f672ae624ad59d0f..6d1fc1c31cb2152b6d20742081118524dbb78d14:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 2b2fa3ad51..7ef46e5423 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -482,20 +482,19 @@ double Model::nextOccuringEventLazy(double now) } if ((action->getMaxDuration() > NO_MAX_DURATION) && - (min == -1 || action->getStartTime() + action->getMaxDuration() < min)) { + (min <= -1 || action->getStartTime() + action->getMaxDuration() < min)) { // when the task will complete anyway because of the deadline if any min = action->getStartTime() + action->getMaxDuration(); max_dur_flag = true; } - XBT_DEBUG("Action(%p) corresponds to variable %d", action, action->getVariable()->id_int); XBT_DEBUG("Action(%p) Start %f. May finish at %f (got a share of %f). Max_duration %f", action, action->getStartTime(), min, share, action->getMaxDuration()); - if (min != -1) { + if (min > -1) { action->heapUpdate(actionHeap_, min, max_dur_flag ? MAX_DURATION : NORMAL); XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now); } else