X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc5903068a99bfc50a9f7a479cc3305326f774e9..7777e8942b95f4adfd35f43b302db2d7e8e9799e:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index cd3173e522..e735c61f7e 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "cpu_interface.hpp" XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); @@ -106,7 +112,7 @@ void CpuModel::updateActionsStateFull(double now, double delta) action->updateMaxDuration(delta); - if ((action->getRemains() <= 0) && + if ((action->getRemainsNoUpdate() <= 0) && (lmm_get_variable_weight(action->getVariable()) > 0)) { action->finish(); action->setState(SURF_ACTION_DONE); @@ -234,17 +240,6 @@ void CpuAction::updateRemainingLazy(double now) m_lastValue = lmm_variable_getvalue(getVariable()); } -void CpuAction::setBound(double bound) -{ - XBT_IN("(%p,%g)", this, bound); - m_bound = bound; - lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), bound); - - if (getModel()->getUpdateMechanism() == UM_LAZY) - heapRemove(getModel()->getActionHeap()); - XBT_OUT(); -} - /* * * This function formulates a constraint problem that pins a given task to