X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/25f00868d318a0c49b4965ea9dea9a78bc349365..53dd673a07059d04f7ee5c280470958856fdf8d8:/src/surf/cpu_ti.cpp diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp index 2cc517ea42..20392ff927 100644 --- a/src/surf/cpu_ti.cpp +++ b/src/surf/cpu_ti.cpp @@ -415,19 +415,15 @@ CpuTiModel::~CpuTiModel() } Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host, - xbt_dynar_t speedPeak, - int pstate, - double speedScale, - tmgr_trace_t speedTrace, - int core, - int initiallyOn, - tmgr_trace_t stateTrace) + xbt_dynar_t speedPeak, + tmgr_trace_t speedTrace, + int core, + tmgr_trace_t stateTrace) { 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, pstate, speedScale, speedTrace, - core, initiallyOn, stateTrace); + CpuTi *cpu = new CpuTi(this, host, speedPeak, speedTrace, core, stateTrace); return cpu; } @@ -471,15 +467,14 @@ void CpuTiModel::updateActionsState(double now, double /*delta*/) * Resource * ************/ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - int pstate, double speedScale, tmgr_trace_t speedTrace, int core, - int initiallyOn, tmgr_trace_t stateTrace) - : Cpu(model, host, NULL, pstate, core, 0, speedScale, initiallyOn) + tmgr_trace_t speedTrace, int core, + tmgr_trace_t stateTrace) + : 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();