simplify the prototype of CpuAction::onStateChange

[simgrid.git] / src / surf / cpu_interface.hpp

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 2cb2d53..4ba92de 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -27,8 +27,6 @@ class CpuPlugin;
  *************/
 XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
 
-XBT_PUBLIC(void) cpu_add_traces();
-
 /*********
  * Model *
  *********/
@@ -53,10 +51,10 @@ public:
    * @param state_initial [TODO]
    * @param state_trace [TODO]
    */
-  virtual Cpu *createCpu(simgrid::Host *host, xbt_dynar_t speedPeak,
-                      int pstate, double speedScale,
+  virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
+                          int pstate, double speedScale,
                           tmgr_trace_t speedTrace, int core,
-                          e_surf_resource_state_t state_initial,
+                          int initiallyOn,
                           tmgr_trace_t state_trace)=0;
 
   void updateActionsStateLazy(double now, double delta);
@@ -74,8 +72,6 @@ public:
 */
 XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource {
 public:
-  Cpu();
-
   /**
    * @brief Cpu constructor
    *
@@ -87,10 +83,11 @@ public:
    * @param speedScale The speed scale of this Cpu in [0;1] (available amount)
    * @param stateInitial whether it is created running or crashed
    */
-  Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint,
+  Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
+    lmm_constraint_t constraint,
          xbt_dynar_t speedPeakList, int pstate,
          int core, double speedPeak, double speedScale,
-         e_surf_resource_state_t stateInitial);
+         int initiallyOn);
 
   /**
    * @brief Cpu constructor
@@ -102,17 +99,10 @@ public:
    * @param speedScale The speed scale of this Cpu in [0;1] (available amount)
    * @param stateInitial whether it is created running or crashed
    */
-  Cpu(simgrid::surf::Model *model, simgrid::Host *host,
+  Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
       xbt_dynar_t speedPeakList, int pstate,
          int core, double speedPeak, double speedScale,
-         e_surf_resource_state_t stateInitial);
-
-  Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint,
-         xbt_dynar_t speedPeakList, int pstate,
-         int core, double speedPeak, double speedScale);
-  Cpu(simgrid::surf::Model *model, simgrid::Host *host,
-         xbt_dynar_t speedPeakList, int pstate,
-         int core, double speedPeak, double speedScale);
+         int initiallyOn);
 
   ~Cpu();
 
@@ -138,6 +128,11 @@ public:
   /** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */
   virtual double getSpeed(double load);
 
+protected:
+  /** @brief Take speed changes (either load or max) into account */
+  virtual void onSpeedChange();
+
+public:
   /** @brief Get the available speed of the current Cpu */
   virtual double getAvailableSpeed();
 
@@ -151,13 +146,13 @@ public:
   virtual int  getPState();
 
   void addTraces(void);
-  simgrid::Host* getHost() { return m_host; }
+  simgrid::s4u::Host* getHost() { return m_host; }
 
 public:
   int m_core = 1;                /* Amount of cores */
   double m_speedPeak;            /*< CPU speed peak, ie max value */
   double m_speedScale;           /*< Percentage of CPU available according to the trace, in [O,1] */
-  simgrid::Host* m_host;
+  simgrid::s4u::Host* m_host;
 
   xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */
   int m_pstate = 0;                   /*< Current pstate (index in the speedPeakList)*/
@@ -180,13 +175,13 @@ XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
 friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
 public:
 /** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
- * @details Callback functions have the following signature: `void(CpuAction *action, e_surf_action_state_t old, e_surf_action_state_t current)`
+ * @details Callback functions have the following signature: `void(CpuAction *action, e_surf_action_state_t previous)`
  */
-  static simgrid::surf::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> onStateChange;
+  static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> onStateChange;
 
   /** @brief CpuAction constructor */
   CpuAction(simgrid::surf::Model *model, double cost, bool failed)
-    : Action(model, cost, failed) {} //FIXME:REMOVE
+    : Action(model, cost, failed) {} //FIXME:DEADCODE?
 
   /** @brief CpuAction constructor */
   CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)