From 9789ab443456db17ab488320128d58373e81cc7d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 21 May 2018 21:11:10 +0200 Subject: [PATCH] make 2 more fields of k:r:Cpu protected (should be private) --- src/surf/cpu_interface.hpp | 1 + src/surf/plugins/host_energy.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index 83115b9a38..f041d8a81c 100644 --- 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 f34657686b..8e3fa2da23 100644 --- 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); } -- 2.20.1