Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --cc include/simgrid/s4u/Host.hpp
Simple merge

diff --cc src/instr/instr_platform.cpp
index 8088380,cb72c4e..6eff605
--- 1/src/instr/instr_platform.cpp
--- 2/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@@ -355,8 -382,10 +382,10 @@@ void instr_define_callbacks(
    // properly
    if (TRACE_needs_platform()) {
      simgrid::s4u::on_platform_created.connect(instr_on_platform_created);
 -    simgrid::s4u::Host::onCreation.connect(instr_host_on_creation);
 -    simgrid::s4u::Host::onSpeedChange.connect(instr_host_on_speed_change);
 +    simgrid::s4u::Host::on_creation.connect(instr_host_on_creation);
++    simgrid::s4u::Host::on_speed_change.connect(instr_host_on_speed_change);
      simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
+     simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
    }
    simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation);
    simgrid::s4u::NetZone::onSeal.connect(instr_netzone_on_seal);

diff --cc src/s4u/s4u_Host.cpp
Simple merge

diff --cc src/surf/cpu_interface.cpp
index a4c750a,e18c775..05fbd12
--- 1/src/surf/cpu_interface.cpp
--- 2/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@@ -133,11 -133,7 +133,7 @@@ double Cpu::get_available_speed(
  }
  
  void Cpu::onSpeedChange() {
-   if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform())
-     instr::Container::by_name(get_cname())
-         ->get_variable("power")
-         ->set_event(surf_get_clock(), coresAmount_ * speed_.scale * speed_.peak);
 -  s4u::Host::onSpeedChange(*host_);
 +  s4u::Host::on_speed_change(*host_);
  }
  
  int Cpu::coreCount()