X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7eb416a6f56eb2184652a78def2dee572a41d8ca..b4b40408881fd9dfc49a7802d4a83689c506b36b:/src/surf/cpu_interface.hpp?ds=sidebyside

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 12a8e00d41..a393754448 100644
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -53,7 +53,7 @@ public:
    * @param state_initial [TODO]
    * @param state_trace [TODO]
    */
-  virtual Cpu *createCpu(const char *name, xbt_dynar_t speedPeak,
+  virtual Cpu *createCpu(simgrid::Host *host, xbt_dynar_t speedPeak,
                       int pstate, double speedScale,
                           tmgr_trace_t speedTrace, int core,
                           e_surf_resource_state_t state_initial,
@@ -82,34 +82,38 @@ public:
    * @brief Cpu constructor
    *
    * @param model The CpuModel associated to this Cpu
-   * @param name The name of the Cpu
+   * @param host The host in which this Cpu should be plugged
    * @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
    * @param core The number of core of this Cpu
    * @param speedPeak The speed peak of this Cpu in flops (max speed)
    * @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, const char *name,
-	  lmm_constraint_t constraint, int core, double speedPeak, double speedScale,
+  Cpu(simgrid::surf::Model *model, simgrid::Host *host, lmm_constraint_t constraint,
+	  xbt_dynar_t speedPeakList, int pstate,
+	  int core, double speedPeak, double speedScale,
 	  e_surf_resource_state_t stateInitial);
 
   /**
    * @brief Cpu constructor
    *
    * @param model The CpuModel associated to this Cpu
-   * @param name The name of the Cpu
+   * @param host The host in which this Cpu should be plugged
    * @param core The number of core of this Cpu
    * @param speedPeak The speed peak of this Cpu in flops (max speed)
    * @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, const char *name,
+  Cpu(simgrid::surf::Model *model, simgrid::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, const char *name,
-	  lmm_constraint_t constraint, int core, double speedPeak, double speedScale);
-  Cpu(simgrid::surf::Model *model, const char *name,
+  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);
 
   ~Cpu();
@@ -142,13 +146,11 @@ public:
   /** @brief Get the current Cpu power peak */
   virtual double getCurrentPowerPeak();
 
-  virtual double getPowerPeakAt(int pstate_index)=0;
-
-  virtual int getNbPstates()=0;
-  virtual void setPstate(int pstate_index)=0;
-  virtual int  getPstate()=0;
+  virtual double getPowerPeakAt(int pstate_index);
 
-  void plug(simgrid::Host* host);
+  virtual int getNbPStates();
+  virtual void setPState(int pstate_index);
+  virtual int  getPState();
 
   void addTraces(void);
   simgrid::Host* getHost() { return m_host; }
@@ -157,7 +159,10 @@ 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 = nullptr;
+  simgrid::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)*/
 
   /* Note (hypervisor): */
   lmm_constraint_t *p_constraintCore=NULL;