X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9de85055aad497b71cb6a2484096228acfa0432..52fd53c1927b271828348841b782281f64b7bef8:/src/surf/cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index a8b793d17f..0f1a3ab114 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -60,7 +60,7 @@ Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, std::vector<d
 
 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), cores_count_(core), host_(host)
+    : Resource(model, host->get_cname(), constraint), core_count_(core), host_(host)
 {
   xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->get_cname());
 
@@ -75,9 +75,13 @@ Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, kernel::lmm::
   }
 }
 
-Cpu::~Cpu() = default;
+Cpu::~Cpu()
+{
+  if (get_model() == surf_cpu_model_pm)
+    speed_per_pstate_.clear();
+}
 
-int Cpu::get_pstates_count()
+int Cpu::get_pstate_count()
 {
   return speed_per_pstate_.size();
 }
@@ -93,7 +97,7 @@ void Cpu::set_pstate(int pstate_index)
   pstate_ = pstate_index;
   speed_.peak = new_peak_speed;
 
-  onSpeedChange();
+  on_speed_change();
 }
 
 int Cpu::get_pstate()
@@ -101,7 +105,7 @@ int Cpu::get_pstate()
   return pstate_;
 }
 
-double Cpu::getPstateSpeed(int pstate_index)
+double Cpu::get_pstate_peak_speed(int pstate_index)
 {
   xbt_assert((pstate_index <= static_cast<int>(speed_per_pstate_.size())),
              "Invalid parameters (pstate index out of bounds)");
@@ -109,32 +113,27 @@ double Cpu::getPstateSpeed(int pstate_index)
   return speed_per_pstate_[pstate_index];
 }
 
-double Cpu::getSpeed(double load)
+double Cpu::get_speed(double load)
 {
   return load * speed_.peak;
 }
 
-double Cpu::get_available_speed()
+double Cpu::get_speed_ratio()
 {
 /* number between 0 and 1 */
   return speed_.scale;
 }
 
-void Cpu::onSpeedChange() {
+void Cpu::on_speed_change()
+{
   s4u::Host::on_speed_change(*host_);
 }
 
-int Cpu::get_cores_count()
+int Cpu::get_core_count()
 {
-  return cores_count_;
+  return core_count_;
 }
 
-void Cpu::setStateTrace(tmgr_trace_t trace)
-{
-  xbt_assert(state_event_ == nullptr, "Cannot set a second state trace to Host %s", host_->get_cname());
-
-  state_event_ = future_evt_set->add_trace(trace, this);
-}
 void Cpu::set_speed_trace(tmgr_trace_t trace)
 {
   xbt_assert(speed_.event == nullptr, "Cannot set a second speed trace to Host %s", host_->get_cname());
@@ -167,17 +166,17 @@ void CpuAction::update_remains_lazy(double now)
   set_last_value(get_variable()->get_value());
 }
 
-simgrid::xbt::signal<void(simgrid::surf::CpuAction*, kernel::resource::Action::State)> CpuAction::onStateChange;
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*, kernel::resource::Action::State)> CpuAction::on_state_change;
 
 void CpuAction::suspend(){
   Action::State previous = get_state();
-  onStateChange(this, previous);
+  on_state_change(this, previous);
   Action::suspend();
 }
 
 void CpuAction::resume(){
   Action::State previous = get_state();
-  onStateChange(this, previous);
+  on_state_change(this, previous);
   Action::resume();
 }
 
@@ -185,7 +184,7 @@ void CpuAction::set_state(Action::State state)
 {
   Action::State previous = get_state();
   Action::set_state(state);
-  onStateChange(this, previous);
+  on_state_change(this, previous);
 }
 /** @brief returns a list of all CPUs that this action is using */
 std::list<Cpu*> CpuAction::cpus() {