X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c0f3756528127131a1947179f56871657a084259..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 7cd104de73..eba8890457 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -4,7 +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 @@ void CpuModel::update_actions_state_lazy(double now, double /*delta*/)
     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 @@ 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), coresAmount_(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());
 
@@ -84,68 +71,74 @@ Cpu::Cpu(kernel::resource::Model* model, simgrid::s4u::Host* host, kernel::lmm::
 
   // Copy the power peak array:
   for (double const& value : *speedPerPstate) {
-    speedPerPstate_.push_back(value);
+    speed_per_pstate_.push_back(value);
   }
 }
 
-Cpu::~Cpu() = default;
+Cpu::~Cpu()
+{
+  if (get_model() == surf_cpu_model_pm)
+    speed_per_pstate_.clear();
+}
 
-int Cpu::getNbPStates()
+int Cpu::get_pstate_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();
+  on_speed_change();
 }
 
-int Cpu::getPState()
+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>(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)
+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::coreCount()
+int Cpu::get_core_count()
 {
-  return coresAmount_;
+  return core_count_;
 }
 
-void Cpu::setStateTrace(tmgr_trace_t trace)
+void Cpu::set_state_trace(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)
 {
@@ -172,11 +165,6 @@ void CpuAction::update_remains_lazy(double now)
                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());
   }