X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4caf1eca81e75be76c2a1c4d3a15896845c58247..81120257e7139d746cabc40d935a6d0f67b95ede:/src/surf/plugins/energy.cpp diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index 702372318a..c65b6f8974 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -6,6 +6,7 @@ #include "energy.hpp" #include "../cpu_cas01.hpp" +#include "../virtual_machine.hpp" /** @addtogroup SURF_plugin_energy @@ -46,77 +47,72 @@ To simulate the energy-related elements, first call the #sg_energy_plugin_init() and then use the following function to retrieve the consumption of a given host: #MSG_host_get_consumed_energy(). */ -XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf, "Logging specific to the SURF energy plugin"); -std::map *surf_energy=NULL; +std::map *surf_energy=NULL; -static void energyCpuCreatedCallback(CpuPtr cpu){ +static void energyCpuCreatedCallback(Cpu *cpu){ (*surf_energy)[cpu] = new CpuEnergy(cpu); } -static void update_consumption_running(CpuPtr cpu, CpuEnergyPtr cpu_energy) { +static void energyVMCreatedCallback(VirtualMachine* vm) { + std::map::iterator cpu_energy_it = surf_energy->find(vm->p_subWs->p_cpu); + xbt_assert(cpu_energy_it != surf_energy->end(), "The cpu is not in surf_energy."); + (*surf_energy)[vm->p_cpu] = cpu_energy_it->second; + cpu_energy_it->second->ref(); // protect the CpuEnergy from getting deleted too early +} + +/* Computes the consumption so far. Called lazily on need. */ +static void update_consumption(Cpu *cpu, CpuEnergy *cpu_energy) { double cpu_load = lmm_constraint_get_usage(cpu->getConstraint()) / cpu->m_powerPeak; double start_time = cpu_energy->last_updated; double finish_time = surf_get_clock(); double previous_energy = cpu_energy->total_energy; - double energy_this_step = cpu_energy->getCurrentWattsValue(cpu_load)*(finish_time-start_time); - cpu_energy->total_energy = previous_energy + energy_this_step; - cpu_energy->last_updated = finish_time; - - XBT_DEBUG("[cpu_update_energy] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J", - start_time, finish_time, cpu->m_powerPeak, previous_energy, energy_this_step); -} -static void update_consumption_off(CpuPtr cpu, CpuEnergyPtr cpu_energy) { - double start_time = cpu_energy->last_updated; - double finish_time = surf_get_clock(); + double instantaneous_consumption; + if (cpu->getState() == SURF_RESOURCE_OFF) + instantaneous_consumption = cpu_energy->watts_off; + else + instantaneous_consumption = cpu_energy->getCurrentWattsValue(cpu_load); - double previous_energy = cpu_energy->total_energy; - double energy_this_step = cpu_energy->watts_off*(finish_time-start_time); + double energy_this_step = instantaneous_consumption*(finish_time-start_time); cpu_energy->total_energy = previous_energy + energy_this_step; cpu_energy->last_updated = finish_time; - XBT_DEBUG("[cpu_update_energy] off period=[%.2f-%.2f]; consumption change: %.2f J -> %.2f J", - start_time, finish_time, previous_energy, energy_this_step); + XBT_DEBUG("[cpu_update_energy] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J", + start_time, finish_time, cpu->m_powerPeak, previous_energy, energy_this_step); } -static void energyCpuDestructedCallback(CpuPtr cpu){ - std::map::iterator cpu_energy_it = surf_energy->find(cpu); +static void energyCpuDestructedCallback(Cpu *cpu){ + std::map::iterator cpu_energy_it = surf_energy->find(cpu); xbt_assert(cpu_energy_it != surf_energy->end(), "The cpu is not in surf_energy."); - CpuEnergyPtr cpu_energy = cpu_energy_it->second; - if (cpu->getState() == SURF_RESOURCE_OFF) - update_consumption_off(cpu, cpu_energy); - else - update_consumption_running(cpu, cpu_energy); + CpuEnergy *cpu_energy = cpu_energy_it->second; + update_consumption(cpu, cpu_energy); - XBT_INFO("Total energy of host %s: %f Joules", cpu->getName(), cpu_energy->getConsumedEnergy()); - delete cpu_energy_it->second; + if (cpu_energy_it->second->refcount == 1) // Don't display anything for virtual CPUs + XBT_INFO("Total energy of host %s: %f Joules", cpu->getName(), cpu_energy->getConsumedEnergy()); + cpu_energy_it->second->unref(); surf_energy->erase(cpu_energy_it); } -static void energyCpuActionStateChangedCallback(CpuActionPtr action, e_surf_action_state_t old, e_surf_action_state_t cur){ - CpuPtr cpu = getActionCpu(action); - CpuEnergyPtr cpu_energy = (*surf_energy)[cpu]; +static void energyCpuActionStateChangedCallback(CpuAction *action, e_surf_action_state_t old, e_surf_action_state_t cur){ + Cpu *cpu = getActionCpu(action); - if(cpu_energy->last_updated < surf_get_clock()) { - update_consumption_running(cpu, cpu_energy); - } + CpuEnergy *cpu_energy = (*surf_energy)[cpu]; + + if(cpu_energy->last_updated < surf_get_clock()) + update_consumption(cpu, cpu_energy); } -static void energyStateChangedCallback(CpuPtr cpu, e_surf_resource_state_t oldState, e_surf_resource_state_t newState){ - CpuEnergyPtr cpu_energy = (*surf_energy)[cpu]; +static void energyStateChangedCallback(Cpu *cpu, e_surf_resource_state_t oldState, e_surf_resource_state_t newState){ + CpuEnergy *cpu_energy = (*surf_energy)[cpu]; - if(cpu_energy->last_updated < surf_get_clock()) { - if (oldState == SURF_RESOURCE_OFF) - update_consumption_off(cpu, cpu_energy); - else - update_consumption_running(cpu, cpu_energy); - } + if(cpu_energy->last_updated < surf_get_clock()) + update_consumption(cpu, cpu_energy); } static void sg_energy_plugin_exit() @@ -131,8 +127,9 @@ static void sg_energy_plugin_exit() */ void sg_energy_plugin_init() { if (surf_energy == NULL) { - surf_energy = new std::map(); + surf_energy = new std::map(); surf_callback_connect(cpuCreatedCallbacks, energyCpuCreatedCallback); + surf_callback_connect(VMCreatedCallbacks, energyVMCreatedCallback); surf_callback_connect(cpuDestructedCallbacks, energyCpuDestructedCallback); surf_callback_connect(cpuActionStateChangedCallbacks, energyCpuActionStateChangedCallback); surf_callback_connect(surfExitCallbacks, sg_energy_plugin_exit); @@ -143,9 +140,9 @@ void sg_energy_plugin_init() { /** * */ -CpuEnergy::CpuEnergy(CpuPtr ptr) - : cpu(ptr) +CpuEnergy::CpuEnergy(Cpu *ptr) { + cpu = ptr; total_energy = 0; power_range_watts_list = getWattsRangeList(); last_updated = surf_get_clock(); @@ -168,6 +165,22 @@ CpuEnergy::~CpuEnergy(){ xbt_dynar_free(&power_range_watts_list); } + +double CpuEnergy::getWattMinAt(int pstate) { + xbt_dynar_t power_range_list = power_range_watts_list; + xbt_assert(power_range_watts_list, "No power range properties specified for host %s", cpu->getName()); + xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(cpu)->getPState(), xbt_dynar_t); + double min_power = xbt_dynar_get_as(current_power_values, 0, double); + return min_power; +} +double CpuEnergy::getWattMaxAt(int pstate) { + xbt_dynar_t power_range_list = power_range_watts_list; + xbt_assert(power_range_watts_list, "No power range properties specified for host %s", cpu->getName()); + xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(cpu)->getPState(), xbt_dynar_t); + double max_power = xbt_dynar_get_as(current_power_values, 1, double); + return max_power; +} + /** * Computes the power consumed by the host according to the current pstate and processor load * @@ -175,18 +188,10 @@ CpuEnergy::~CpuEnergy(){ double CpuEnergy::getCurrentWattsValue(double cpu_load) { xbt_dynar_t power_range_list = power_range_watts_list; - - if (power_range_list == NULL) - { - XBT_DEBUG("No power range properties specified for host %s", cpu->getName()); - return 0; - } - /*xbt_assert(xbt_dynar_length(power_range_list) == xbt_dynar_length(cpu->p_powerPeakList), - "The number of power ranges in the properties does not match the number of pstates for host %s", - cpu->getName());*/ + xbt_assert(power_range_watts_list, "No power range properties specified for host %s", cpu->getName()); /* retrieve the power values associated with the current pstate */ - xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(cpu)->getPState(), xbt_dynar_t); + xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(cpu)->getPState(), xbt_dynar_t); /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ @@ -204,13 +209,11 @@ double CpuEnergy::getCurrentWattsValue(double cpu_load) double CpuEnergy::getConsumedEnergy() { - if(last_updated < surf_get_clock()) { - if (cpu->getState() == SURF_RESOURCE_OFF) - update_consumption_off(cpu, this); - else - update_consumption_running(cpu, this); - } - return total_energy; + + if(last_updated < surf_get_clock()) + update_consumption(cpu, this); + return total_energy; + } xbt_dynar_t CpuEnergy::getWattsRangeList()