From: Martin Quinson Date: Sun, 2 Oct 2016 13:25:43 +0000 (+0200) Subject: kill (hopefully) dead code X-Git-Tag: v3_14~380 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ba5e509f6ff4c2d1ef9cb834e3275e43610d28f6 kill (hopefully) dead code --- diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index a90e142e33..9f8e4bfe91 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -20,22 +20,15 @@ simgrid::surf::CpuModel *surf_cpu_model_vm; namespace simgrid { namespace surf { -/************* - * Callbacks * - *************/ - -simgrid::xbt::signal cpuActionStateChangedCallbacks; - /********* * Model * *********/ -CpuModel::~CpuModel() = default; - void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { while ((xbt_heap_size(getActionHeap()) > 0) && (double_equals(xbt_heap_maxkey(getActionHeap()), now, sg_surf_precision))) { + CpuAction *action = static_cast(xbt_heap_pop(getActionHeap())); XBT_CDEBUG(surf_kernel, "Something happened to action %p", action); if (TRACE_is_enabled()) { @@ -52,7 +45,6 @@ void CpuModel::updateActionsStateLazy(double now, double /*delta*/) /* set the remains to 0 due to precision problems when updating the remaining amount */ action->setRemains(0); action->setState(Action::State::done); - action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped } if (TRACE_is_enabled()) { //defining the last timestamp that we can safely dump to trace file diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 5823a71414..790e61c9ab 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -38,7 +38,7 @@ class CpuAction; XBT_PUBLIC_CLASS CpuModel : public Model { public: CpuModel() : Model() {}; - ~CpuModel() override; + ~CpuModel() = default; /** * @brief Create a Cpu