From: Martin Quinson Date: Tue, 22 Dec 2015 21:26:06 +0000 (+0100) Subject: Kill unused simgrid::surf::HostAction X-Git-Tag: v3_13~1407 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6d8b8ade25d24e33e57eb02b443f567a0733c664?hp=0d7a222297c1d39c43cdb2f09ea1d5ddd03c7aa0 Kill unused simgrid::surf::HostAction --- diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp index 2c403954f6..a9f48dded7 100644 --- a/src/surf/host_interface.cpp +++ b/src/surf/host_interface.cpp @@ -391,16 +391,5 @@ void Host::setParams(vm_params_t params) p_params = *params; } -/********** - * Action * - **********/ -simgrid::surf::signal HostAction::onStateChange; - -void HostAction::setState(e_surf_action_state_t state){ - e_surf_action_state_t old = getState(); - Action::setState(state); - onStateChange(this, old, state); -} - } } diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index ee5aee369d..c6c144d231 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -277,41 +277,6 @@ private: s_vm_params_t p_params; }; -/********** - * Action * - **********/ - -/** @ingroup SURF_host_interface - * @brief SURF host action interface class - */ -class HostAction : public Action { -public: - static simgrid::surf::signal onStateChange; - - /** - * @brief HostAction constructor - * - * @param model The HostModel associated to this HostAction - * @param cost The cost of this HostAction in [TODO] - * @param failed [description] - */ - HostAction(simgrid::surf::Model *model, double cost, bool failed) - : Action(model, cost, failed) {} - - /** - * @brief HostAction constructor - * - * @param model The HostModel associated to this HostAction - * @param cost The cost of this HostAction in [TODO] - * @param failed [description] - * @param var The lmm variable associated to this StorageAction if it is part of a LMM component - */ - HostAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) - : Action(model, cost, failed, var) {} - - void setState(e_surf_action_state_t state); -}; - } } diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp index 15fb2ad023..e5a892a5fe 100644 --- a/src/surf/host_ptask_L07.hpp +++ b/src/surf/host_ptask_L07.hpp @@ -140,7 +140,7 @@ public: /********** * Action * **********/ -class L07Action : public HostAction { +class L07Action : public CpuAction { friend Action *CpuL07::execute(double size); friend Action *CpuL07::sleep(double duration); friend Action *HostL07Model::executeParallelTask(int host_nb, @@ -150,7 +150,7 @@ class L07Action : public HostAction { double rate); public: L07Action(Model *model, double cost, bool failed) - : HostAction(model, cost, failed) {}; + : CpuAction(model, cost, failed) {}; ~L07Action(); void updateBound();