X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38fa7b2d3e69aa9aa4957b2b847bec34bc1096ac..446069ad8e6d4580649af853f64ebbd259737bbe:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index ed4f8dd4a3..a90e142e33 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -30,14 +30,13 @@ simgrid::xbt::signal cpuActionSt * Model * *********/ -CpuModel::~CpuModel() {} +CpuModel::~CpuModel() = default; void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { - CpuAction *action; while ((xbt_heap_size(getActionHeap()) > 0) && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { - action = static_cast(xbt_heap_pop(getActionHeap())); + CpuAction *action = static_cast(xbt_heap_pop(getActionHeap())); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); if (TRACE_is_enabled()) { Cpu *cpu = static_cast(lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0))); @@ -62,7 +61,7 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) ActionList *actionSet = getRunningActionSet(); for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end()) ; it != itend ; ++it) { - action = static_cast(&*it); + CpuAction *action = static_cast(&*it); if (smaller < 0) { smaller = action->getLastUpdate(); continue; @@ -75,7 +74,6 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) TRACE_last_timestamp_to_dump = smaller; } } - return; } void CpuModel::updateActionsStateFull(double now, double delta)