[simix] simcall to run code in kernel mode

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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 302d393..374db5c 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -131,12 +131,6 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 /************
  * Resource *
  ************/
-Cpu::Cpu()
-{
-       xbt_die("FIXME: DEADCODE");
-}
-
-
 Cpu::Cpu(Model *model, simgrid::Host *host,
             xbt_dynar_t speedPeakList, int pstate,
                 int core, double speedPeak, double speedScale,
@@ -185,20 +179,6 @@ Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
   }
 }
 
-Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
-  xbt_dynar_t speedPeakList, int pstate,
-  int core, double speedPeak, double speedScale)
-: Cpu(model, host, constraint, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{
-       xbt_die("FIXME: DEADCODE");
-}
-
-Cpu::Cpu(Model *model, simgrid::Host *host,
-  xbt_dynar_t speedPeakList, int pstate,
-  int core, double speedPeak, double speedScale)
-: Cpu(model, host, speedPeakList, pstate, core, speedPeak, speedScale, SURF_RESOURCE_ON)
-{}
-
 Cpu::~Cpu()
 {
   if (p_constraintCoreId){
@@ -230,6 +210,8 @@ 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;
+
+  onSpeedChange();
 }
 
 int Cpu::getPState()
@@ -256,6 +238,12 @@ double Cpu::getAvailableSpeed()
   return m_speedScale;
 }
 
+void Cpu::onSpeedChange() {
+       TRACE_surf_host_set_speed(surf_get_clock(), getName(),
+                       m_core * m_speedScale * m_speedPeak);
+}
+
+
 int Cpu::getCore()
 {
   return m_core;