make k:r:Cpu::speed_per_pstate_ private as it should

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 0b61967..7f5c672 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -90,15 +90,7 @@ CpuCas01::CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<d
 {
 }
 
-CpuCas01::~CpuCas01()
-{
-  if (get_model() == surf_cpu_model_pm)
-    speed_per_pstate_.clear();
-}
-
-std::vector<double> * CpuCas01::getSpeedPeakList(){
-  return &speed_per_pstate_;
-}
+CpuCas01::~CpuCas01() = default;
 
 bool CpuCas01::is_used()
 {

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 0009db9..da01315 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -44,8 +44,6 @@ public:
 
   bool is_used() override;
 
-  std::vector<double> * getSpeedPeakList(); // FIXME: killme to hide our internals
-
 protected:
   void onSpeedChange() override;
 };

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index a8b793d..7fffcb5 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -75,7 +75,11 @@ 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()
 {

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 26f76ac..83115b9 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -130,14 +130,17 @@ private:
   simgrid::s4u::Host* host_;
 
   int pstate_ = 0;                     /*< Current pstate (index in the speedPeakList)*/
-protected:
   std::vector<double> speed_per_pstate_; /*< List of supported CPU capacities (pstate related) */
 
 public:
-  virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */
-  virtual void
-  set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to
-                                          external load). Trace must contain relative values (ratio between 0 and 1) */
+  /** @brief Setup the trace file with states events (ON or OFF).
+   * Trace must contain boolean values (0 or 1).
+   */
+  virtual void setStateTrace(tmgr_trace_t trace);
+  /*< @brief Setup the trace file with availability events (peak speed changes due to external load).
+   * Trace must contain relative values (ratio between 0 and 1)
+   */
+  virtual void set_speed_trace(tmgr_trace_t trace);
 
   tmgr_trace_event_t state_event_ = nullptr;
   Metric speed_                  = {1.0, 0, nullptr};