make 2 more fields of k:r:Cpu protected (should be private)

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 83115b9..f041d8a 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -142,6 +142,7 @@ public:
    */
   virtual void set_speed_trace(tmgr_trace_t trace);
 
+protected:
   tmgr_trace_event_t state_event_ = nullptr;
   Metric speed_                  = {1.0, 0, nullptr};
 };

diff --git a/src/surf/plugins/host_energy.cpp b/src/surf/plugins/host_energy.cpp
index f346576..8e3fa2d 100644 (file)
--- a/src/surf/plugins/host_energy.cpp
+++ b/src/surf/plugins/host_energy.cpp
@@ -171,7 +171,7 @@ void HostEnergy::update()
 
     XBT_DEBUG("[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> "
               "%.2f J",
-              host->get_cname(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy,
+              host->get_cname(), start_time, finish_time, host->pimpl_cpu->getSpeed(1.0), previous_energy,
               energy_this_step);
   }