routing: inline 2 functions

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

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 766ed5d..20392ff 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -416,7 +416,6 @@ CpuTiModel::~CpuTiModel()
 
 Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host,
     xbt_dynar_t speedPeak,
-    double speedScale,
     tmgr_trace_t speedTrace,
     int core,
     tmgr_trace_t stateTrace)
@@ -424,7 +423,7 @@ Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host,
   xbt_assert(core==1,"Multi-core not handled with this model yet");
   xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
       "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?");
-  CpuTi *cpu = new CpuTi(this, host, speedPeak, speedScale, speedTrace, core, stateTrace);
+  CpuTi *cpu = new CpuTi(this, host, speedPeak, speedTrace, core, stateTrace);
   return cpu;
 }
 
@@ -468,15 +467,14 @@ void CpuTiModel::updateActionsState(double now, double /*delta*/)
  * Resource *
  ************/
 CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
-        double speedScale, tmgr_trace_t speedTrace, int core,
+        tmgr_trace_t speedTrace, int core,
         tmgr_trace_t stateTrace)
-  : Cpu(model, host, NULL, core, 0, speedScale)
+  : Cpu(model, host, NULL, core, 0)
 {
   xbt_assert(core==1,"Multi-core not handled by this model yet");
   m_core = core;
 
-  p_speed.scale = speedScale;
-  availTrace_ = new CpuTiTgmr(speedTrace, speedScale);
+  availTrace_ = new CpuTiTgmr(speedTrace, 1/*scale*/);
 
   actionSet_ = new ActionTiList();