X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a614499935bd6927065e86dcced8f234253a6e3..c6a24bce95a8c071c0e1131eecb5e7985e02970a:/src/plugins/host_energy.cpp diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index 400fb8570a..175c455bc8 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -3,6 +3,7 @@ /* 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" @@ -18,7 +19,7 @@ SIMGRID_REGISTER_PLUGIN(host_energy, "Cpu energy consumption.", &sg_host_energy_ /** @defgroup plugin_host_energy - @rst + @beginrst This is the energy plugin, enabling to account not only for computation time, but also for the dissipated energy in the simulated platform. To activate this plugin, first call :cpp:func:`sg_host_energy_plugin_init()` before your :cpp:func:`MSG_init()`, and then use @@ -187,9 +188,10 @@ void HostEnergy::update() this->total_energy_ = previous_energy + energy_this_step; this->last_updated_ = finish_time; - XBT_DEBUG("[update_energy of %s] period=[%.8f-%.8f]; current speed=%.2E flop/s (pstate %i); total consumption before: %.8f J -> added now: %.8f J", - host_->get_cname(), start_time, finish_time, host_->pimpl_cpu->get_pstate_peak_speed(this->pstate_), this->pstate_, previous_energy, - energy_this_step); + XBT_DEBUG("[update_energy of %s] period=[%.8f-%.8f]; current speed=%.2E flop/s (pstate %i); total consumption " + "before: %.8f J -> added now: %.8f J", + host_->get_cname(), start_time, finish_time, host_->get_pstate_speed(this->pstate_), this->pstate_, + previous_energy, energy_this_step); } /* Save data for the upcoming time interval: whether it's on/off and the pstate if it's on */ @@ -199,11 +201,12 @@ void HostEnergy::update() HostEnergy::HostEnergy(simgrid::s4u::Host* ptr) : host_(ptr), last_updated_(surf_get_clock()) { init_watts_range_list(); - static bool warned = false; const char* off_power_str = host_->get_property("wattage_off"); if (off_power_str == nullptr) { off_power_str = host_->get_property("watt_off"); + + static bool warned = false; if (off_power_str != nullptr && not warned) { warned = true; XBT_WARN("Please use 'wattage_off' instead of 'watt_off' to define the idle wattage of hosts in your XML."); @@ -268,10 +271,10 @@ double HostEnergy::get_current_watts_value() // We consider that the machine is then fully loaded. That's arbitrary but it avoids a NaN cpu_load = 1; else { - cpu_load = host_->pimpl_cpu->get_constraint()->get_usage() / current_speed; + cpu_load = host_->get_load() / current_speed; /* Divide by the number of cores here to have a value between 0 and 1 */ - cpu_load /= host_->pimpl_cpu->get_core_count(); + cpu_load /= host_->get_core_count(); if (cpu_load > 1) // This condition is true for energy_ptask on 32 bits, even if cpu_load is displayed as 1.000000 cpu_load = 1; // That may be an harmless rounding error? @@ -340,10 +343,10 @@ void HostEnergy::init_watts_range_list() boost::split(all_power_values, old_prop, boost::is_any_of(",")); xbt_assert(all_power_values.size() == (unsigned)host_->get_pstate_count(), - "Invalid XML file. Found %lu energetic profiles for %d pstates", - all_power_values.size(), host_->get_pstate_count()); + "Invalid XML file. Found %zu energetic profiles for %d pstates", all_power_values.size(), + host_->get_pstate_count()); - // XBT_ATTRIB_DEPRECATED_v327: puting this macro name here so that we find it during the deprecation cleanups of v3.28 + // XBT_ATTRIB_DEPRECATED_v328: putting this macro name here so that we find it during the deprecation cleanups std::string msg = std::string("DEPRECATION WARNING: Property 'watt_per_state' will only work until v3.28.\n"); msg += std::string("The old syntax 'Idle:OneCore:AllCores' must be converted into 'Idle:Epsilon:AllCores' to " "properly model the consumption of non-whole tasks on mono-core hosts. Here are the values to " @@ -355,13 +358,12 @@ void HostEnergy::init_watts_range_list() boost::split(current_power_values, current_power_values_str, boost::is_any_of(":")); double p_idle = xbt_str_parse_double((current_power_values.at(0)).c_str(), "Invalid obsolete XML file. Fix your watt_per_state property."); - double p_one_core; double p_full; double p_epsilon; if (current_power_values.size() == 3) { - p_one_core = xbt_str_parse_double((current_power_values.at(1)).c_str(), - "Invalid obsolete XML file. Fix your watt_per_state property."); + double p_one_core = xbt_str_parse_double((current_power_values.at(1)).c_str(), + "Invalid obsolete XML file. Fix your watt_per_state property."); p_full = xbt_str_parse_double((current_power_values.at(2)).c_str(), "Invalid obsolete XML file. Fix your watt_per_state property."); if (host_->get_core_count() == 1) { @@ -369,7 +371,7 @@ void HostEnergy::init_watts_range_list() } else { p_epsilon = p_one_core - ((p_full - p_one_core) / (host_->get_core_count() - 1)); } - } else { // consuption given with idle and full only + } else { // consumption given with idle and full only p_full = xbt_str_parse_double((current_power_values.at(1)).c_str(), "Invalid obsolete XML file. Fix your watt_per_state property."); if (host_->get_core_count() == 1) { @@ -407,8 +409,8 @@ void HostEnergy::init_watts_range_list() 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 %lu energetic profiles for %d pstates", - all_power_values.size(), host_->get_pstate_count()); + "Invalid XML file. Found %zu energetic profiles for %d pstates", all_power_values.size(), + host_->get_pstate_count()); int i = 0; for (auto const& current_power_values_str : all_power_values) { @@ -459,7 +461,7 @@ static void on_creation(simgrid::s4u::Host& host) if (dynamic_cast(&host)) // Ignore virtual machines return; - // TODO Trace: set to zero the energy variable associated to host->getName() + // TODO Trace: set to zero the energy variable associated to host->get_name() host.extension_set(new HostEnergy(&host)); } @@ -580,6 +582,13 @@ void sg_host_energy_update_all() }); } +static void ensure_plugin_inited() +{ + if (not HostEnergy::EXTENSION_ID.valid()) + throw simgrid::xbt::InitializationError("The Energy plugin is not active. Please call sg_host_energy_plugin_init() " + "before calling any function related to that plugin."); +} + /** @ingroup plugin_host_energy * @brief Returns the total energy consumed by the host so far (in Joules) * @@ -589,19 +598,16 @@ void sg_host_energy_update_all() */ double sg_host_get_consumed_energy(sg_host_t host) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_consumed_energy(); } /** @ingroup plugin_host_energy * @brief Get the amount of watt dissipated when the host is idling - * This function is deprecated and will not work after v3.27. Use sg_host_get_idle_consumption_at instead. */ double sg_host_get_idle_consumption(sg_host_t host) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_idle_at(0); } @@ -610,8 +616,7 @@ double sg_host_get_idle_consumption(sg_host_t host) */ double sg_host_get_idle_consumption_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_idle_at(pstate); } @@ -620,8 +625,7 @@ double sg_host_get_idle_consumption_at(sg_host_t host, int pstate) */ double sg_host_get_wattmin_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_min_at(pstate); } /** @ingroup plugin_host_energy @@ -629,8 +633,7 @@ double sg_host_get_wattmin_at(sg_host_t host, int pstate) */ double sg_host_get_wattmax_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_max_at(pstate); } /** @ingroup plugin_host_energy @@ -638,8 +641,7 @@ double sg_host_get_wattmax_at(sg_host_t host, int pstate) */ double sg_host_get_power_range_slope_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_power_range_slope_at(pstate); } /** @ingroup plugin_host_energy @@ -647,7 +649,6 @@ double sg_host_get_power_range_slope_at(sg_host_t host, int pstate) */ double sg_host_get_current_consumption(sg_host_t host) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_current_watts_value(); }