[SURF/S4U] Rename Cpu::getCore() to Cpu::getCoreCount()

[simgrid.git] / src / surf / cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 5c95964..ed4f8dd 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -125,39 +125,33 @@ bool CpuModel::next_occuring_event_isIdempotent()
 /************
  * Resource *
  ************/
-Cpu::Cpu(Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)
+Cpu::Cpu(Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)
  : Cpu(model, host, nullptr/*constraint*/, speedPerPstate, core)
 {
 }
 
 Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
-    xbt_dynar_t speedPerPstate, int core)
+    std::vector<double> * speedPerPstate, int core)
  : Resource(model, host->name().c_str(), constraint)
  , coresAmount_(core)
  , host_(host)
 {
   xbt_assert(core > 0, "Host %s must have at least one core, not 0.", host->name().c_str());
 
-  speed_.peak = xbt_dynar_get_as(speedPerPstate, 0/*pstate*/, double);
+  speed_.peak = speedPerPstate->front();
   speed_.scale = 1;
   host->pimpl_cpu = this;
   xbt_assert(speed_.scale > 0, "Speed of host %s must be >0", host->name().c_str());
 
   // Copy the power peak array:
-  speedPerPstate_ = xbt_dynar_new(sizeof(double), nullptr);
-  unsigned long n = xbt_dynar_length(speedPerPstate);
-  for (unsigned long i = 0; i != n; ++i) {
-    double value = xbt_dynar_get_as(speedPerPstate, i, double);
-    xbt_dynar_push(speedPerPstate_, &value);
+  for (double value : *speedPerPstate) {
+    speedPerPstate_.push_back(value);
   }
 
   xbt_assert(model == surf_cpu_model_pm || core==1, "Currently, VM cannot be multicore");
 }
 
-Cpu::~Cpu()
-{
-  xbt_dynar_free(&speedPerPstate_);
-}
+Cpu::~Cpu() = default;
 
 double Cpu::getPstateSpeedCurrent()
 {
@@ -166,16 +160,16 @@ double Cpu::getPstateSpeedCurrent()
 
 int Cpu::getNbPStates()
 {
-  return xbt_dynar_length(speedPerPstate_);
+  return speedPerPstate_.size();
 }
 
 void Cpu::setPState(int pstate_index)
 {
-  xbt_dynar_t plist = speedPerPstate_;
-  xbt_assert(pstate_index <= (int)xbt_dynar_length(plist),
-      "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index, (int)xbt_dynar_length(plist));
+  xbt_assert(pstate_index <= static_cast<int>(speedPerPstate_.size()),
+      "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index,
+      static_cast<int>(speedPerPstate_.size()));
 
-  double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double);
+  double new_peak_speed = speedPerPstate_[pstate_index];
   pstate_ = pstate_index;
   speed_.peak = new_peak_speed;
 
@@ -189,10 +183,9 @@ int Cpu::getPState()
 
 double Cpu::getPstateSpeed(int pstate_index)
 {
-  xbt_dynar_t plist = speedPerPstate_;
-  xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
+  xbt_assert((pstate_index <= static_cast<int>(speedPerPstate_.size())), "Invalid parameters (pstate index out of bounds)");
 
-  return xbt_dynar_get_as(plist, pstate_index, double);
+  return speedPerPstate_[pstate_index];
 }
 
 double Cpu::getSpeed(double load)
@@ -210,8 +203,7 @@ void Cpu::onSpeedChange() {
   TRACE_surf_host_set_speed(surf_get_clock(), getName(), coresAmount_ * speed_.scale * speed_.peak);
 }
 
-
-int Cpu::getCore()
+int Cpu::getCoreCount()
 {
   return coresAmount_;
 }