X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b2a3d0647da44e1e6d0eb44ebe1bd7182461023a..7ca0938c68d7ab5644571795a93cb34b82a2cfe5:/src/plugins/host_energy.cpp diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index 46c48c2e6f..2b62506659 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -199,11 +199,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."); @@ -343,7 +344,7 @@ void HostEnergy::init_watts_range_list() "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 +356,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) {