Merge branch 'master' of github.com:mquinson/simgrid

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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 7629b04..e6a50ec 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -7,6 +7,7 @@
 #include <xbt/dynar.h>
 #include "cpu_interface.hpp"
 #include "plugins/energy.hpp"
+#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
@@ -128,25 +129,21 @@ void CpuModel::updateActionsStateFull(double now, double delta)
  * Resource *
  ************/
 Cpu::Cpu(Model *model, simgrid::s4u::Host *host,
-       xbt_dynar_t speedPeakList, int pstate,
-     int core, double speedPeak, double speedScale,
-     int initiallyOn)
- : Cpu(model, host, NULL/*constraint*/, speedPeakList, pstate, core, speedPeak, speedScale, initiallyOn)
+    xbt_dynar_t speedPeakList, int core, double speedPeak)
+ : Cpu(model, host, NULL/*constraint*/, speedPeakList, core, speedPeak)
 {
 }
 
 Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
-        xbt_dynar_t speedPeakList, int pstate,
-      int core, double speedPeak,
-        double speedScale, int initiallyOn)
- : Resource(model, host->name().c_str(), constraint, initiallyOn)
+    xbt_dynar_t speedPeakList, int core, double speedPeak)
+ : Resource(model, host->name().c_str(), constraint)
  , m_core(core)
- , m_speedPeak(speedPeak)
- , m_speedScale(speedScale)
  , m_host(host)
 {
+  p_speed.peak = speedPeak;
+  p_speed.scale = 1;
   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);
@@ -156,8 +153,6 @@ Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
     xbt_dynar_push(p_speedPeakList, &value);
   }
 
-  m_pstate = pstate;
-
   /* Currently, we assume that a VM does not have a multicore CPU. */
   if (core > 1)
     xbt_assert(model == surf_cpu_model_pm);
@@ -170,7 +165,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 +186,7 @@ Cpu::~Cpu()
 
 double Cpu::getCurrentPowerPeak()
 {
-  return m_speedPeak;
+  return p_speed.peak;
 }
 
 int Cpu::getNbPStates()
@@ -207,7 +202,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 +222,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 +250,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);
 }