further rename power to speed in surf internals

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

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 8644a7b..a260cd0 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -105,9 +105,6 @@ Cpu *CpuCas01Model::createCpu(const char *name, xbt_dynar_t power_peak,
 {
   Cpu *cpu = NULL;
   sg_host_t host = sg_host_by_name(name);
-  xbt_assert(!sg_host_surfcpu(host),
-             "Host '%s' declared several times in the platform file",
-             name);
   xbt_assert(xbt_dynar_getfirst_as(power_peak, double) > 0.0,
       "Power has to be >0.0. Did you forget to specify the mandatory power attribute?");
   xbt_assert(core > 0, "Invalid number of cores %d. Must be larger than 0", core);
@@ -165,23 +162,23 @@ CpuCas01::CpuCas01(CpuCas01Model *model, const char *name, xbt_dynar_t powerPeak
          lmm_constraint_new(model->getMaxminSystem(), this, core * powerScale * xbt_dynar_get_as(powerPeak, pstate, double)),
          core, xbt_dynar_get_as(powerPeak, pstate, double), powerScale,
     stateInitial) {
-  p_powerEvent = NULL;
+  p_speedEvent = NULL;
 
   // Copy the power peak array:
-  p_powerPeakList = xbt_dynar_new(sizeof(double), nullptr);
+  p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr);
   unsigned long n = xbt_dynar_length(powerPeak);
   for (unsigned long i = 0; i != n; ++i) {
     double value = xbt_dynar_get_as(powerPeak, i, double);
-    xbt_dynar_push(p_powerPeakList, &value);
+    xbt_dynar_push(p_speedPeakList, &value);
   }
 
   m_pstate = pstate;
 
-  XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate);
+  XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate);
 
   m_core = core;
   if (powerTrace)
-    p_powerEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this);
+    p_speedEvent = tmgr_history_add_trace(history, powerTrace, 0.0, 0, this);
 
   if (stateTrace)
     p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
@@ -189,7 +186,7 @@ CpuCas01::CpuCas01(CpuCas01Model *model, const char *name, xbt_dynar_t powerPeak
 
 CpuCas01::~CpuCas01(){
   if (getModel() == surf_cpu_model_pm)
-    xbt_dynar_free(&p_powerPeakList);
+    xbt_dynar_free(&p_speedPeakList);
 }
 
 void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent)
@@ -199,11 +196,11 @@ void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent)
 
 void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent)
 {
-  p_powerEvent = powerEvent;
+  p_speedEvent = powerEvent;
 }
 
 xbt_dynar_t CpuCas01::getPowerPeakList(){
-  return p_powerPeakList;
+  return p_speedPeakList;
 }
 
 int CpuCas01::getPState()
@@ -221,27 +218,27 @@ void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d
   lmm_variable_t var = NULL;
   lmm_element_t elem = NULL;
 
-  if (event_type == p_powerEvent) {
+  if (event_type == p_speedEvent) {
        /* TODO (Hypervisor): do the same thing for constraint_core[i] */
        xbt_assert(m_core == 1, "FIXME: add power scaling code also for constraint_core[i]");
 
-    m_powerScale = value;
+    m_speedScale = value;
     lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
-                                m_core * m_powerScale *
-                                m_powerPeak);
+                                m_core * m_speedScale *
+                                m_speedPeak);
     TRACE_surf_host_set_power(date, getName(),
-                              m_core * m_powerScale *
-                              m_powerPeak);
+                              m_core * m_speedScale *
+                              m_speedPeak);
     while ((var = lmm_get_var_from_cnst
             (getModel()->getMaxminSystem(), getConstraint(), &elem))) {
       CpuCas01Action *action = static_cast<CpuCas01Action*>(lmm_variable_id(var));
 
       lmm_update_variable_bound(getModel()->getMaxminSystem(),
                                 action->getVariable(),
-                                m_powerScale * m_powerPeak);
+                                m_speedScale * m_speedPeak);
     }
     if (tmgr_trace_event_free(event_type))
-      p_powerEvent = NULL;
+      p_speedEvent = NULL;
   } else if (event_type == p_stateEvent) {
        /* TODO (Hypervisor): do the same thing for constraint_core[i] */
     xbt_assert(m_core == 1, "FIXME: add state change code also for constraint_core[i]");
@@ -281,7 +278,7 @@ CpuAction *CpuCas01::execute(double size)
 
   XBT_IN("(%s,%g)", getName(), size);
   CpuCas01Action *action = new CpuCas01Action(getModel(), size, getState() != SURF_RESOURCE_ON,
-                                                             m_powerScale * m_powerPeak, getConstraint());
+                                                             m_speedScale * m_speedPeak, getConstraint());
 
   XBT_OUT();
   return action;
@@ -294,7 +291,7 @@ CpuAction *CpuCas01::sleep(double duration)
 
   XBT_IN("(%s,%g)", getName(), duration);
   CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, getState() != SURF_RESOURCE_ON,
-                                                      m_powerScale * m_powerPeak, getConstraint());
+                                                      m_speedScale * m_speedPeak, getConstraint());
 
 
   // FIXME: sleep variables should not consume 1.0 in lmm_expand
@@ -324,12 +321,12 @@ CpuAction *CpuCas01::sleep(double duration)
 
 double CpuCas01::getCurrentPowerPeak()
 {
-  return m_powerPeak;
+  return m_speedPeak;
 }
 
 double CpuCas01::getPowerPeakAt(int pstate_index)
 {
-  xbt_dynar_t plist = p_powerPeakList;
+  xbt_dynar_t plist = p_speedPeakList;
   xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
 
   return xbt_dynar_get_as(plist, pstate_index, double);
@@ -337,17 +334,17 @@ double CpuCas01::getPowerPeakAt(int pstate_index)
 
 int CpuCas01::getNbPstates()
 {
-  return xbt_dynar_length(p_powerPeakList);
+  return xbt_dynar_length(p_speedPeakList);
 }
 
 void CpuCas01::setPstate(int pstate_index)
 {
-  xbt_dynar_t plist = p_powerPeakList;
+  xbt_dynar_t plist = p_speedPeakList;
   xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
 
   double new_pstate = xbt_dynar_get_as(plist, pstate_index, double);
   m_pstate = pstate_index;
-  m_powerPeak = new_pstate;
+  m_speedPeak = new_pstate;
 }
 
 int CpuCas01::getPstate()