try to sort out the surf headers a bit, if possible

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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index c9a152e..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,19 +129,19 @@ void CpuModel::updateActionsStateFull(double now, double delta)
  * Resource *
  ************/
 Cpu::Cpu(Model *model, simgrid::s4u::Host *host,
-    xbt_dynar_t speedPeakList, int core, double speedPeak, double speedScale)
- : Cpu(model, host, NULL/*constraint*/, speedPeakList, core, speedPeak, speedScale)
+    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 core, double speedPeak, double speedScale)
+    xbt_dynar_t speedPeakList, int core, double speedPeak)
  : Resource(model, host->name().c_str(), constraint)
  , m_core(core)
  , m_host(host)
 {
   p_speed.peak = speedPeak;
-  p_speed.scale = speedScale;
+  p_speed.scale = 1;
   host->pimpl_cpu = this;
   xbt_assert(p_speed.scale > 0, "Available speed has to be >0");