X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0199ba108d66c94df94e4f044994e79efdece4b1..4669bd296b7e363e8b25cf53990622c51c33c373:/src/plugins/host_energy.cpp diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index 450890cea0..18ed351da1 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -3,14 +3,15 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/Exception.hpp" -#include "simgrid/plugins/energy.h" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Exec.hpp" -#include "src/include/surf/surf.hpp" -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/surf/cpu_interface.hpp" +#include +#include +#include +#include +#include +#include +#include + +#include "src/kernel/resource/CpuImpl.hpp" #include #include @@ -131,6 +132,7 @@ class HostEnergy { simgrid::s4u::Host* host_ = nullptr; /*< List of (idle_power, epsilon_power, max_power) tuple corresponding to each cpu pstate */ std::vector power_range_watts_list_; + bool has_pstate_power_values_ = false; /*< Whether power consumption values were provided for all pstates */ /* We need to keep track of what pstate has been used, as we will sometimes be notified only *after* a pstate has been * used (but we need to update the energy consumption with the old pstate!) @@ -139,7 +141,7 @@ class HostEnergy { const int pstate_off_ = -1; double watts_off_ = 0.0; /*< Consumption when the machine is turned off (shutdown) */ double total_energy_ = 0.0; /*< Total energy consumed by the host */ - double last_updated_ = surf_get_clock(); /*< Timestamp of the last energy update event*/ + double last_updated_ = simgrid::s4u::Engine::get_clock(); /*< Timestamp of the last energy update event*/ /* Only used to split total energy into unused/used hosts. * If you want to get this info for something else, rather use the host_load plugin @@ -155,6 +157,8 @@ public: explicit HostEnergy(simgrid::s4u::Host* ptr); ~HostEnergy(); + bool has_pstate_power_values() const; + double get_current_watts_value(); double get_current_watts_value(double cpu_load) const; double get_consumed_energy(); @@ -168,11 +172,16 @@ public: simgrid::xbt::Extension HostEnergy::EXTENSION_ID; +/* Returns whether power consumption values were provided for all pstates. */ +bool HostEnergy::has_pstate_power_values() const { + return has_pstate_power_values_; +} + /* Computes the consumption so far. Called lazily on need. */ void HostEnergy::update() { double start_time = last_updated_; - double finish_time = surf_get_clock(); + double finish_time = simgrid::s4u::Engine::get_clock(); // // We may have start == finish if the past consumption was updated since the simcall was started // for example if 2 actors requested to update the same host's consumption in a given scheduling round. @@ -221,29 +230,29 @@ HostEnergy::~HostEnergy() = default; double HostEnergy::get_watt_idle_at(int pstate) const { - xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s", - host_->get_cname()); + if (not has_pstate_power_values_) + return 0.0; return power_range_watts_list_[pstate].idle_; } double HostEnergy::get_watt_min_at(int pstate) const { - xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s", - host_->get_cname()); + if (not has_pstate_power_values_) + return 0.0; return power_range_watts_list_[pstate].epsilon_; } double HostEnergy::get_watt_max_at(int pstate) const { - xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s", - host_->get_cname()); + if (not has_pstate_power_values_) + return 0.0; return power_range_watts_list_[pstate].max_; } double HostEnergy::get_power_range_slope_at(int pstate) const { - xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s", - host_->get_cname()); + if (not has_pstate_power_values_) + return 0.0; return power_range_watts_list_[pstate].slope_; } @@ -285,8 +294,8 @@ double HostEnergy::get_current_watts_value() */ double HostEnergy::get_current_watts_value(double cpu_load) const { - xbt_assert(not power_range_watts_list_.empty(), "No power range properties specified for host %s", - host_->get_cname()); + if (not has_pstate_power_values_) + return 0.0; /* Return watts_off if pstate == pstate_off (ie, if the host is off) */ if (this->pstate_ == pstate_off_) { @@ -323,7 +332,7 @@ double HostEnergy::get_current_watts_value(double cpu_load) const double HostEnergy::get_consumed_energy() { - if (last_updated_ < surf_get_clock()) // We need to simcall this as it modifies the environment + if (last_updated_ < simgrid::s4u::Engine::get_clock()) // We need to simcall this as it modifies the environment simgrid::kernel::actor::simcall(std::bind(&HostEnergy::update, this)); return total_energy_; @@ -333,12 +342,7 @@ void HostEnergy::init_watts_range_list() { const char* all_power_values_str = host_->get_property("wattage_per_state"); if (all_power_values_str == nullptr) { - /* If no power values are given, we assume it's 0 everywhere */ - XBT_DEBUG("No energetic profiles given for host %s, using 0 W by default.", host_->get_cname()); - for (int i = 0; i < host_->get_pstate_count(); ++i) { - PowerRange range(0,0,0); - power_range_watts_list_.push_back(range); - } + XBT_WARN("No energetic profiles (wattage_per_state) given for host %s, using 0 W by default. Direct request of power/energy consumption of this host will fail.", host_->get_cname()); return; } @@ -346,8 +350,8 @@ void HostEnergy::init_watts_range_list() boost::split(all_power_values, all_power_values_str, boost::is_any_of(",")); XBT_DEBUG("%s: power properties: %s", host_->get_cname(), all_power_values_str); - xbt_assert(all_power_values.size() == (unsigned)host_->get_pstate_count(), - "Invalid XML file. Found %zu energetic profiles for %d pstates", all_power_values.size(), + xbt_assert(all_power_values.size() == host_->get_pstate_count(), + "Invalid XML file. Found %zu energetic profiles for %lu pstates", all_power_values.size(), host_->get_pstate_count()); int i = 0; @@ -384,6 +388,8 @@ void HostEnergy::init_watts_range_list() power_range_watts_list_.push_back(range); ++i; } + + has_pstate_power_values_ = true; } } // namespace plugin } // namespace simgrid @@ -415,7 +421,7 @@ static void on_action_state_change(simgrid::kernel::resource::CpuAction const& a // Get the host_energy extension for the relevant host auto* host_energy = host->extension(); - if (host_energy->get_last_update_time() < surf_get_clock()) + if (host_energy->get_last_update_time() < simgrid::s4u::Engine::get_clock()) host_energy->update(); } } @@ -530,7 +536,10 @@ static void ensure_plugin_inited() double sg_host_get_consumed_energy(const_sg_host_t host) { ensure_plugin_inited(); - return host->extension()->get_consumed_energy(); + auto host_energy = host->extension(); + xbt_assert(host_energy->has_pstate_power_values(), "No power range properties specified for host %s", + host->get_cname()); + return host_energy->get_consumed_energy(); } /** @ingroup plugin_host_energy @@ -581,5 +590,8 @@ double sg_host_get_power_range_slope_at(const_sg_host_t host, int pstate) double sg_host_get_current_consumption(const_sg_host_t host) { ensure_plugin_inited(); - return host->extension()->get_current_watts_value(); + auto host_energy = host->extension(); + xbt_assert(host_energy->has_pstate_power_values(), "No power range properties specified for host %s", + host->get_cname()); + return host_energy->get_current_watts_value(); }