further rename power to speed in surf internals

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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 0513ad65173b323bd59619ea1339e90900d88367..39f1cb9cd92bf9499f677d5875c2d459ff2c8adb 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -138,8 +138,8 @@ Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
          e_surf_resource_state_t stateInitial)
  : Resource(model, name, props, stateInitial)
  , m_core(core)
- , m_powerPeak(powerPeak)
- , m_powerScale(powerScale)
+ , m_speedPeak(powerPeak)
+ , m_speedScale(powerScale)
  , p_constraintCore(NULL)
  , p_constraintCoreId(NULL)
 {
@@ -147,12 +147,12 @@ Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
 }
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-        lmm_constraint_t constraint, int core, double powerPeak,
-        double powerScale, e_surf_resource_state_t stateInitial)
+        lmm_constraint_t constraint, int core, double speedPeak,
+        double speedScale, e_surf_resource_state_t stateInitial)
  : Resource(model, name, props, constraint, stateInitial)
  , m_core(core)
- , m_powerPeak(powerPeak)
- , m_powerScale(powerScale)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
 {
   /* At now, we assume that a VM does not have a multicore CPU. */
   if (core > 1)
@@ -168,19 +168,19 @@ Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
     for (i = 0; i < core; i++) {
       /* just for a unique id, never used as a string. */
       p_constraintCoreId[i] = bprintf("%s:%i", name, i);
-      p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak);
+      p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak);
     }
   }
 }
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-  lmm_constraint_t constraint, int core, double powerPeak, double powerScale)
-: Cpu(model, name, props, constraint, core, powerPeak, powerScale, SURF_RESOURCE_ON)
+  lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
+: Cpu(model, name, props, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
 {}
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-  int core, double powerPeak, double powerScale)
-: Cpu(model, name, props, core, powerPeak, powerScale, SURF_RESOURCE_ON)
+  int core, double speedPeak, double speedScale)
+: Cpu(model, name, props, core, speedPeak, speedScale, SURF_RESOURCE_ON)
 {}
 
 Cpu::~Cpu(){
@@ -197,18 +197,18 @@ Cpu::~Cpu(){
 
 double Cpu::getCurrentPowerPeak()
 {
-  return m_powerPeak;
+  return m_speedPeak;
 }
 
 double Cpu::getSpeed(double load)
 {
-  return load * m_powerPeak;
+  return load * m_speedPeak;
 }
 
 double Cpu::getAvailableSpeed()
 {
 /* number between 0 and 1 */
-  return m_powerScale;
+  return m_speedScale;
 }
 
 int Cpu::getCore()