X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/16bbb8a8212497d9c44c81333ed2c0e689e0c5af..7d87bd675e40074957819b602f38fb905209990e:/src/surf/cpu_interface.cpp?ds=sidebyside

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 7629b04619..50b4ee1810 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -141,12 +141,12 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
         double speedScale, int initiallyOn)
  : Resource(model, host->name().c_str(), constraint, initiallyOn)
  , m_core(core)
- , m_speedPeak(speedPeak)
- , m_speedScale(speedScale)
  , m_host(host)
 {
+  p_speed.peak = speedPeak;
+  p_speed.scale = speedScale;
   host->pimpl_cpu = this;
-  xbt_assert(m_speedScale > 0, "Available speed has to be >0");
+  xbt_assert(p_speed.scale > 0, "Available speed has to be >0");
 
   // Copy the power peak array:
   p_speedPeakList = xbt_dynar_new(sizeof(double), nullptr);
@@ -170,7 +170,7 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
     for (i = 0; i < core; i++) {
       /* just for a unique id, never used as a string. */
       p_constraintCoreId[i] = bprintf("%s:%i", host->name().c_str(), i);
-      p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak);
+      p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], p_speed.scale * p_speed.peak);
     }
   }
 }
@@ -191,7 +191,7 @@ Cpu::~Cpu()
 
 double Cpu::getCurrentPowerPeak()
 {
-  return m_speedPeak;
+  return p_speed.peak;
 }
 
 int Cpu::getNbPStates()
@@ -207,7 +207,7 @@ void Cpu::setPState(int pstate_index)
 
   double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double);
   m_pstate = pstate_index;
-  m_speedPeak = new_peak_speed;
+  p_speed.peak = new_peak_speed;
 
   onSpeedChange();
 }
@@ -227,18 +227,18 @@ double Cpu::getPowerPeakAt(int pstate_index)
 
 double Cpu::getSpeed(double load)
 {
-  return load * m_speedPeak;
+  return load * p_speed.peak;
 }
 
 double Cpu::getAvailableSpeed()
 {
 /* number between 0 and 1 */
-  return m_speedScale;
+  return p_speed.scale;
 }
 
 void Cpu::onSpeedChange() {
   TRACE_surf_host_set_speed(surf_get_clock(), getName(),
-      m_core * m_speedScale * m_speedPeak);
+      m_core * p_speed.scale * p_speed.peak);
 }
 
 
@@ -255,9 +255,9 @@ void Cpu::set_state_trace(tmgr_trace_t trace)
 }
 void Cpu::set_speed_trace(tmgr_trace_t trace)
 {
-  xbt_assert(p_speedEvent==NULL,"Cannot set a second speed trace to Host %s", m_host->name().c_str());
+  xbt_assert(p_speed.event==NULL,"Cannot set a second speed trace to Host %s", m_host->name().c_str());
 
-  p_speedEvent = future_evt_set->add_trace(trace, 0.0, this);
+  p_speed.event = future_evt_set->add_trace(trace, 0.0, this);
 }