Kill unused simgrid::surf::HostAction

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 2c40395..a9f48dd 100644 (file)
--- 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;
 }
 
   p_params = *params;
 }
 

-/**********
- * Action *
- **********/
-simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> 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 ee5aee3..c6c144d 100644 (file)
--- a/src/surf/host_interface.hpp
+++ b/src/surf/host_interface.hpp
@@ -277,41 +277,6 @@ private:
   s_vm_params_t p_params;
 };
 
   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<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> 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 15fb2ad..e5a892a 100644 (file)
--- a/src/surf/host_ptask_L07.hpp
+++ b/src/surf/host_ptask_L07.hpp
@@ -140,7 +140,7 @@ public:
 /**********
  * Action *
  **********/
 /**********
  * 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,
   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)
                                                    double rate);
 public:
   L07Action(Model *model, double cost, bool failed)

-  : HostAction(model, cost, failed) {};
+  : CpuAction(model, cost, failed) {};

  ~L07Action();
 
   void updateBound();
  ~L07Action();
 
   void updateBound();