X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/efd5719fdcd06a99d1fd644b81c7e9d578c08fc5..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index d8fd429171..5b31783685 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -33,10 +33,6 @@ Cpu *getActionCpu(CpuAction *action) {
 
 simgrid::xbt::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> cpuActionStateChangedCallbacks;
 
-void cpu_add_traces(){
-  surf_cpu_model_pm->addTraces();
-}
-
 /*********
  * Model *
  *********/
@@ -131,7 +127,7 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 /************
  * Resource *
  ************/
-Cpu::Cpu(Model *model, simgrid::Host *host,
+Cpu::Cpu(Model *model, simgrid::s4u::Host *host,
 	     xbt_dynar_t speedPeakList, int pstate,
 		 int core, double speedPeak, double speedScale,
 		 int initiallyOn)
@@ -139,11 +135,11 @@ Cpu::Cpu(Model *model, simgrid::Host *host,
 {
 }
 
-Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
+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->getName().c_str(), constraint, initiallyOn)
+ : Resource(model, host->name().c_str(), constraint, initiallyOn)
  , m_core(core)
  , m_speedPeak(speedPeak)
  , m_speedScale(speedScale)
@@ -173,7 +169,7 @@ Cpu::Cpu(Model *model, simgrid::Host *host, lmm_constraint_t constraint,
     int i;
     for (i = 0; i < core; i++) {
       /* just for a unique id, never used as a string. */
-      p_constraintCoreId[i] = bprintf("%s:%i", host->getName().c_str(), i);
+      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);
     }
   }
@@ -349,12 +345,12 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask)
   XBT_OUT();
 }
 
-simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> CpuAction::onStateChange;
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> CpuAction::onStateChange;
 
 void CpuAction::setState(e_surf_action_state_t state){
-  e_surf_action_state_t old = getState();
+  e_surf_action_state_t previous = getState();
   Action::setState(state);
-  onStateChange(this, old, state);
+  onStateChange(this, previous);
 }
 
 }