X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe14db8f94df5cc46ba2f2a5d688a1b0b763ec29..8c416e92254512408c1d0ce729e8d3cf82ec9938:/src/surf/plugins/host_energy.cpp diff --git a/src/surf/plugins/host_energy.cpp b/src/surf/plugins/host_energy.cpp index 8826efc78a..7bf554eee9 100644 --- a/src/surf/plugins/host_energy.cpp +++ b/src/surf/plugins/host_energy.cpp @@ -1,21 +1,16 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ /* 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/plugins/energy.h" #include "simgrid/plugins/load.h" -#include "simgrid/simix.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/cpu_interface.hpp" - #include "simgrid/s4u/Engine.hpp" #include #include -#include -#include -#include /** @addtogroup plugin_energy @@ -176,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->getCname(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy, + host->get_cname(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy, energy_this_step); } @@ -193,7 +188,7 @@ HostEnergy::HostEnergy(simgrid::s4u::Host* ptr) : host(ptr), last_updated(surf_g try { this->watts_off = std::stod(std::string(off_power_str)); } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid value for property watt_off of host ") + host->getCname() + + throw std::invalid_argument(std::string("Invalid value for property watt_off of host ") + host->get_cname() + ": " + off_power_str); } } @@ -204,13 +199,13 @@ HostEnergy::~HostEnergy() = default; double HostEnergy::getWattMinAt(int pstate) { - xbt_assert(not power_range_watts_list.empty(), "No power range properties specified for host %s", host->getCname()); + xbt_assert(not power_range_watts_list.empty(), "No power range properties specified for host %s", host->get_cname()); return power_range_watts_list[pstate].min; } double HostEnergy::getWattMaxAt(int pstate) { - xbt_assert(not power_range_watts_list.empty(), "No power range properties specified for host %s", host->getCname()); + xbt_assert(not power_range_watts_list.empty(), "No power range properties specified for host %s", host->get_cname()); return power_range_watts_list[pstate].max; } @@ -237,7 +232,7 @@ double HostEnergy::getCurrentWattsValue() // 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->constraint()->get_usage() / current_speed; + cpu_load = host->pimpl_cpu->get_constraint()->get_usage() / current_speed; /** Divide by the number of cores here **/ cpu_load /= host->pimpl_cpu->coreCount(); @@ -261,12 +256,9 @@ double HostEnergy::getCurrentWattsValue() */ double HostEnergy::getCurrentWattsValue(double cpu_load) { - xbt_assert(not power_range_watts_list.empty(), "No power range properties specified for host %s", host->getCname()); + xbt_assert(not power_range_watts_list.empty(), "No power range properties specified for host %s", host->get_cname()); - /* - * * Return watts_off if pstate == pstate_off - * * this happens when host is off - */ + /* Return watts_off if pstate == pstate_off (ie, if the host is off) */ if (this->pstate == pstate_off) { return watts_off; } @@ -328,7 +320,7 @@ void HostEnergy::initWattsRangeList() std::vector all_power_values; boost::split(all_power_values, all_power_values_str, boost::is_any_of(",")); - XBT_DEBUG("%s: profile: %s, cores: %d", host->getCname(), all_power_values_str, host->getCoreCount()); + XBT_DEBUG("%s: profile: %s, cores: %d", host->get_cname(), all_power_values_str, host->getCoreCount()); int i = 0; for (auto const& current_power_values_str : all_power_values) { @@ -339,7 +331,7 @@ void HostEnergy::initWattsRangeList() xbt_assert(current_power_values.size() == 2 || current_power_values.size() == 3, "Power properties incorrectly defined for host %s." "It should be 'Idle:FullSpeed' power values because you have one core only.", - host->getCname()); + host->get_cname()); if (current_power_values.size() == 2) { // In this case, 1core == AllCores current_power_values.push_back(current_power_values.at(1)); @@ -349,20 +341,20 @@ void HostEnergy::initWattsRangeList() "The energy profile of mono-cores should be formatted as 'Idle:FullSpeed' only.\n" "If you go for a 'Idle:OneCore:AllCores' power profile on mono-cores, then OneCore and AllCores " "must be equal.", - host->getCname()); + host->get_cname()); } } else { xbt_assert(current_power_values.size() == 3, "Power properties incorrectly defined for host %s." "It should be 'Idle:OneCore:AllCores' power values because you have more than one core.", - host->getCname()); + host->get_cname()); } /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ - char* msg_idle = bprintf("Invalid idle value for pstate %d on host %s: %%s", i, host->getCname()); - char* msg_min = bprintf("Invalid OneCore value for pstate %d on host %s: %%s", i, host->getCname()); - char* msg_max = bprintf("Invalid AllCores value for pstate %d on host %s: %%s", i, host->getCname()); + char* msg_idle = bprintf("Invalid idle value for pstate %d on host %s: %%s", i, host->get_cname()); + char* msg_min = bprintf("Invalid OneCore value for pstate %d on host %s: %%s", i, host->get_cname()); + char* msg_max = bprintf("Invalid AllCores value for pstate %d on host %s: %%s", i, host->get_cname()); PowerRange range(xbt_str_parse_double((current_power_values.at(0)).c_str(), msg_idle), xbt_str_parse_double((current_power_values.at(1)).c_str(), msg_min), xbt_str_parse_double((current_power_values.at(2)).c_str(), msg_max)); @@ -389,7 +381,7 @@ static void onCreation(simgrid::s4u::Host& host) host.extension_set(new HostEnergy(&host)); } -static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::surf::Action::State previous) +static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::kernel::resource::Action::State previous) { for (simgrid::surf::Cpu* const& cpu : action->cpus()) { simgrid::s4u::Host* host = cpu->getHost(); @@ -426,14 +418,13 @@ static void onHostDestruction(simgrid::s4u::Host& host) if (dynamic_cast(&host)) // Ignore virtual machines return; - XBT_INFO("Energy consumption of host %s: %f Joules", host.getCname(), + XBT_INFO("Energy consumption of host %s: %f Joules", host.get_cname(), host.extension()->getConsumedEnergy()); } static void onSimulationEnd() { - std::vector hosts; - simgrid::s4u::Engine::getInstance()->getHostList(&hosts); + std::vector hosts = simgrid::s4u::Engine::getInstance()->get_all_hosts(); double total_energy = 0.0; // Total energy consumption (whole platform) double used_hosts_energy = 0.0; // Energy consumed by hosts that computed something @@ -452,7 +443,6 @@ static void onSimulationEnd() } /* **************************** Public interface *************************** */ -extern "C" { /** \ingroup plugin_energy * \brief Enable host energy plugin @@ -484,8 +474,7 @@ void sg_host_energy_plugin_init() void sg_host_energy_update_all() { simgrid::simix::kernelImmediate([]() { - std::vector list; - simgrid::s4u::Engine::getInstance()->getHostList(&list); + std::vector list = simgrid::s4u::Engine::getInstance()->get_all_hosts(); for (auto const& host : list) if (dynamic_cast(host) == nullptr) // Ignore virtual machines host->extension()->update(); @@ -502,7 +491,7 @@ 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_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getConsumedEnergy(); } @@ -512,7 +501,7 @@ double sg_host_get_consumed_energy(sg_host_t host) 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_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getWattMinAt(pstate); } /** @ingroup plugin_energy @@ -521,7 +510,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_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getWattMaxAt(pstate); } @@ -531,7 +520,6 @@ double sg_host_get_wattmax_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_energy_plugin_init() during initialization."); + "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); return host->extension()->getCurrentWattsValue(); } -}