From 9fb4cfa01d427fa144e8daabab7e853520e4dbf6 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 20 Jul 2015 12:37:23 +0200 Subject: [PATCH] kill dead code: Action::recycle never got implemented --- src/surf/cpu_ti.cpp | 5 ----- src/surf/cpu_ti.hpp | 1 - src/surf/network_cm02.cpp | 4 ---- src/surf/network_cm02.hpp | 1 - src/surf/network_constant.cpp | 5 ----- src/surf/network_constant.hpp | 1 - src/surf/storage_n11.hpp | 1 - src/surf/surf_interface.hpp | 3 --- 8 files changed, 21 deletions(-) diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 160fa74c85..9841ec9503 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -903,11 +903,6 @@ void CpuTiAction::cancel() return; } -void CpuTiAction::recycle() -{ - DIE_IMPOSSIBLE; -} - void CpuTiAction::suspend() { XBT_IN("(%p)", this); diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 022e2ce62a..de57ece312 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -161,7 +161,6 @@ public: void setState(e_surf_action_state_t state); int unref(); void cancel(); - void recycle(); void updateIndexHeap(int i); void suspend(); void resume(); diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index fd81be35cf..e9c08ba986 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -689,8 +689,4 @@ void NetworkCm02Action::updateRemainingLazy(double now) m_lastUpdate = now; m_lastValue = lmm_variable_getvalue(getVariable()); } -void NetworkCm02Action::recycle() -{ - return; -} diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index f9d418ab69..3dd58ea178 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -92,7 +92,6 @@ public: NetworkCm02Action(Model *model, double cost, bool failed) : NetworkAction(model, cost, failed) {}; void updateRemainingLazy(double now); - void recycle(); }; #endif /* SURF_NETWORK_CM02_HPP_ */ diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 65744733c9..47f923fd31 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -157,11 +157,6 @@ void NetworkConstantAction::resume() m_suspended = false; } -void NetworkConstantAction::recycle() -{ - return; -} - bool NetworkConstantAction::isSuspended() { return m_suspended; diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index ecff72a5a3..0705b978ed 100644 --- a/src/surf/network_constant.hpp +++ b/src/surf/network_constant.hpp @@ -62,7 +62,6 @@ public: p_variable = NULL; }; int unref(); - void recycle(); void cancel(); void setCategory(const char *category); void suspend(); diff --git a/src/surf/storage_n11.hpp b/src/surf/storage_n11.hpp index a65620ac64..d9d3941c5f 100644 --- a/src/surf/storage_n11.hpp +++ b/src/surf/storage_n11.hpp @@ -63,7 +63,6 @@ public: void suspend(); int unref(); void cancel(); - //FIXME:??void recycle(); void resume(); bool isSuspended(); void setMaxDuration(double duration); diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index f243cac497..2197bb078d 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -467,9 +467,6 @@ public: /** @brief Cancel the current Action if running */ virtual void cancel(); - /** @brief Recycle an Action */ - virtual void recycle(){}; - /** @brief Suspend the current Action */ virtual void suspend(); -- 2.20.1