X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08e7455d67920bbd7a87f440d00f2c1e071314a0..7073caeb8a32a2a18ad9bef9143d42cbbceee47f:/src/plugins/link_energy.cpp diff --git a/src/plugins/link_energy.cpp b/src/plugins/link_energy.cpp index efea1533f1..f97f316b12 100644 --- a/src/plugins/link_energy.cpp +++ b/src/plugins/link_energy.cpp @@ -46,19 +46,6 @@ namespace simgrid { namespace plugin { class LinkEnergy { -public: - static simgrid::xbt::Extension EXTENSION_ID; - - explicit LinkEnergy(simgrid::s4u::Link* ptr) : link_(ptr), last_updated_(surf_get_clock()) {} - ~LinkEnergy() = default; - - void init_watts_range_list(); - double get_consumed_energy(); - void update(); - -private: - double get_power() const; - s4u::Link* link_{}; bool inited_{false}; @@ -67,13 +54,24 @@ private: double total_energy_{0.0}; double last_updated_{0.0}; /*< Timestamp of the last energy update event*/ + + double get_power() const; + +public: + static xbt::Extension EXTENSION_ID; + + explicit LinkEnergy(s4u::Link* ptr) : link_(ptr), last_updated_(surf_get_clock()) {} + + void init_watts_range_list(); + double get_consumed_energy(); + void update(); }; xbt::Extension LinkEnergy::EXTENSION_ID; void LinkEnergy::update() { - if (!inited_) + if (not inited_) init_watts_range_list(); double power = get_power(); @@ -127,7 +125,7 @@ void LinkEnergy::init_watts_range_list() double LinkEnergy::get_power() const { - if (!inited_) + if (not inited_) return 0.0; double power_slope = busy_ - idle_;