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

diff --combined src/surf/cpu_interface.cpp
index 727c602,6445903..a8b793d
--- 1/src/surf/cpu_interface.cpp
--- 2/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@@ -4,7 -4,6 +4,6 @@@
   * under the terms of the license (GNU LGPL) which comes with this package. */
  
  #include "cpu_interface.hpp"
- #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
  #include "src/surf/surf_interface.hpp"
  #include "surf/surf.hpp"
  
@@@ -31,18 -30,6 +30,6 @@@ void CpuModel::update_actions_state_laz
      action->finish(kernel::resource::Action::State::FINISHED);
      XBT_CDEBUG(surf_kernel, "Action %p finished", action);
    }
-   if (TRACE_is_enabled()) {
-     //defining the last timestamp that we can safely dump to trace file
-     //without losing the event ascending order (considering all CPU's)
-     double smaller = -1;
-     for (kernel::resource::Action const& action : *get_started_action_set()) {
-       if (smaller < 0 || action.get_last_update() < smaller)
-         smaller = action.get_last_update();
-     }
-     if (smaller > 0) {
-       TRACE_last_timestamp_to_dump = smaller;
-     }
-   }
  }
  
  void CpuModel::update_actions_state_full(double now, double delta)
@@@ -73,7 -60,7 +60,7 @@@ Cpu::Cpu(kernel::resource::Model* model
  
  Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, kernel::lmm::Constraint* constraint,
           std::vector<double>* speedPerPstate, int core)
 -    : Resource(model, host->get_cname(), constraint), coresAmount_(core), host_(host)
 +    : Resource(model, host->get_cname(), constraint), cores_count_(core), host_(host)
  {
    xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->get_cname());
  
@@@ -84,42 -71,41 +71,42 @@@
  
    // Copy the power peak array:
    for (double const& value : *speedPerPstate) {
 -    speedPerPstate_.push_back(value);
 +    speed_per_pstate_.push_back(value);
    }
  }
  
  Cpu::~Cpu() = default;
  
 -int Cpu::getNbPStates()
 +int Cpu::get_pstates_count()
  {
 -  return speedPerPstate_.size();
 +  return speed_per_pstate_.size();
  }
  
 -void Cpu::setPState(int pstate_index)
 +void Cpu::set_pstate(int pstate_index)
  {
 -  xbt_assert(pstate_index <= static_cast<int>(speedPerPstate_.size()),
 +  xbt_assert(pstate_index <= static_cast<int>(speed_per_pstate_.size()),
               "Invalid parameters for CPU %s (pstate %d > length of pstates %d). Please fix your platform file, or your "
               "call to change the pstate.",
 -             get_cname(), pstate_index, static_cast<int>(speedPerPstate_.size()));
 +             get_cname(), pstate_index, static_cast<int>(speed_per_pstate_.size()));
  
 -  double new_peak_speed = speedPerPstate_[pstate_index];
 +  double new_peak_speed = speed_per_pstate_[pstate_index];
    pstate_ = pstate_index;
    speed_.peak = new_peak_speed;
  
    onSpeedChange();
  }
  
 -int Cpu::getPState()
 +int Cpu::get_pstate()
  {
    return pstate_;
  }
  
  double Cpu::getPstateSpeed(int pstate_index)
  {
 -  xbt_assert((pstate_index <= static_cast<int>(speedPerPstate_.size())), "Invalid parameters (pstate index out of bounds)");
 +  xbt_assert((pstate_index <= static_cast<int>(speed_per_pstate_.size())),
 +             "Invalid parameters (pstate index out of bounds)");
  
 -  return speedPerPstate_[pstate_index];
 +  return speed_per_pstate_[pstate_index];
  }
  
  double Cpu::getSpeed(double load)
@@@ -137,16 -123,16 +124,16 @@@ void Cpu::onSpeedChange() 
    s4u::Host::on_speed_change(*host_);
  }
  
 -int Cpu::coreCount()
 +int Cpu::get_cores_count()
  {
 -  return coresAmount_;
 +  return cores_count_;
  }
  
  void Cpu::setStateTrace(tmgr_trace_t trace)
  {
 -  xbt_assert(stateEvent_ == nullptr, "Cannot set a second state trace to Host %s", host_->get_cname());
 +  xbt_assert(state_event_ == nullptr, "Cannot set a second state trace to Host %s", host_->get_cname());
  
 -  stateEvent_ = future_evt_set->add_trace(trace, this);
 +  state_event_ = future_evt_set->add_trace(trace, this);
  }
  void Cpu::set_speed_trace(tmgr_trace_t trace)
  {
@@@ -173,11 -159,6 +160,6 @@@ void CpuAction::update_remains_lazy(dou
                 get_last_update());
      update_remains(get_last_value() * delta);
  
-     if (TRACE_is_enabled()) {
-       Cpu* cpu = static_cast<Cpu*>(get_variable()->get_constraint(0)->get_id());
-       TRACE_surf_resource_set_utilization("HOST", "power_used", cpu->get_cname(), get_category(), get_last_value(),
-                                           get_last_update(), now - get_last_update());
-     }
      XBT_CDEBUG(surf_kernel, "Updating action(%p): remains is now %f", this, get_remains_no_update());
    }