X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5026d98d0656e9d0f9afb2aeecf09c314ea7a5f6..d152b8d41e99f1c87e94bf1030576f9ccf34898b:/src/surf/plugins/energy.cpp diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index 0a7f9ab6d7..8f5a2baeaa 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -4,9 +4,9 @@ /* 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 "energy.hpp" -#include "../cpu_cas01.hpp" -#include "../virtual_machine.hpp" +#include +#include +#include /** @addtogroup SURF_plugin_energy @@ -50,22 +50,20 @@ and then use the following function to retrieve the consumption of a given host: XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf, "Logging specific to the SURF energy plugin"); -std::map *surf_energy=NULL; +namespace simgrid { +namespace energy { -static void energyHostCreatedCallback(Host *host){ - (*surf_energy)[host] = new HostEnergy(host); -} +std::map *surf_energy = NULL; -static void energyVMCreatedCallback(VirtualMachine* vm) { - std::map::iterator host_energy_it = surf_energy->find(vm->p_subWs); - xbt_assert(host_energy_it != surf_energy->end(), "The host is not in surf_energy."); - (*surf_energy)[vm] = host_energy_it->second; - host_energy_it->second->ref(); // protect the HostEnergy from getting deleted too early +} } +using simgrid::energy::HostEnergy; +using simgrid::energy::surf_energy; + /* Computes the consumption so far. Called lazily on need. */ -static void update_consumption(Host *host, HostEnergy *host_energy) { - double cpu_load = lmm_constraint_get_usage(host->p_cpu->getConstraint()) / host->p_cpu->m_powerPeak; +static void update_consumption(simgrid::surf::Host *host, HostEnergy *host_energy) { + double cpu_load = lmm_constraint_get_usage(host->p_cpu->getConstraint()) / host->p_cpu->m_speedPeak; double start_time = host_energy->last_updated; double finish_time = surf_get_clock(); @@ -83,43 +81,7 @@ static void update_consumption(Host *host, HostEnergy *host_energy) { host_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, host->p_cpu->m_powerPeak, previous_energy, energy_this_step); -} - -static void energyHostDestructedCallback(Host *host){ - std::map::iterator host_energy_it = surf_energy->find(host); - xbt_assert(host_energy_it != surf_energy->end(), "The host is not in surf_energy."); - - HostEnergy *host_energy = host_energy_it->second; - update_consumption(host, host_energy); - - if (host_energy_it->second->refcount == 1) // Don't display anything for virtual CPUs - XBT_INFO("Total energy of host %s: %f Joules", host->getName(), host_energy->getConsumedEnergy()); - host_energy_it->second->unref(); - surf_energy->erase(host_energy_it); -} - -static void energyCpuActionStateChangedCallback(CpuAction *action, e_surf_action_state_t old, e_surf_action_state_t cur){ - const char *name = getActionCpu(action)->getName(); - Host *host = static_cast(surf_host_resource_priv(sg_host_by_name(name))); - - HostEnergy *host_energy = (*surf_energy)[host]; - - if(host_energy->last_updated < surf_get_clock()) - update_consumption(host, host_energy); -} - -static void energyStateChangedCallback(Host *host, e_surf_resource_state_t oldState, e_surf_resource_state_t newState){ - HostEnergy *host_energy = (*surf_energy)[host]; - - if(host_energy->last_updated < surf_get_clock()) - update_consumption(host, host_energy); -} - -static void sg_energy_plugin_exit() -{ - delete surf_energy; - surf_energy = NULL; + start_time, finish_time, host->p_cpu->m_speedPeak, previous_energy, energy_this_step); } /** \ingroup SURF_plugin_energy @@ -127,21 +89,73 @@ static void sg_energy_plugin_exit() * \details Enable energy plugin to get joules consumption of each cpu. You should call this function before #MSG_init(). */ void sg_energy_plugin_init() { - if (surf_energy == NULL) { - surf_energy = new std::map(); - surf_callback_connect(hostCreatedCallbacks, energyHostCreatedCallback); - surf_callback_connect(VMCreatedCallbacks, energyVMCreatedCallback); - surf_callback_connect(hostDestructedCallbacks, energyHostDestructedCallback); - surf_callback_connect(cpuActionStateChangedCallbacks, energyCpuActionStateChangedCallback); - surf_callback_connect(surfExitCallbacks, sg_energy_plugin_exit); - surf_callback_connect(hostStateChangedCallbacks, energyStateChangedCallback); + if (simgrid::energy::surf_energy == NULL) { + + simgrid::energy::surf_energy = new std::map(); + + /* The following attaches an anonymous function to the Host::onCreation signal */ + /* Search for "C++ lambda" for more information on the syntax used here */ + simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host *host) { + (*surf_energy)[host] = new HostEnergy(host); + }); + + simgrid::surf::VMCreatedCallbacks.connect([](simgrid::surf::VirtualMachine* vm) { + std::map::iterator host_energy_it = + surf_energy->find(vm->p_hostPM->extension(simgrid::surf::Host::EXTENSION_ID)); + xbt_assert(host_energy_it != surf_energy->end(), "The host is not in surf_energy."); + (*surf_energy)[vm] = host_energy_it->second; + host_energy_it->second->ref(); // protect the HostEnergy from getting deleted too early + }); + + simgrid::surf::Host::onDestruction.connect([](simgrid::surf::Host *host) { + std::map::iterator host_energy_it = surf_energy->find(host); + xbt_assert(host_energy_it != surf_energy->end(), "The host is not in surf_energy."); + + HostEnergy *host_energy = host_energy_it->second; + update_consumption(host, host_energy); + + if (host_energy_it->second->refcount == 1) // Don't display anything for virtual CPUs + XBT_INFO("Total energy of host %s: %f Joules", host->getName(), host_energy->getConsumedEnergy()); + host_energy_it->second->unref(); + surf_energy->erase(host_energy_it); + }); + simgrid::surf::CpuAction::onStateChange.connect([](simgrid::surf::CpuAction *action, + e_surf_action_state_t old, + e_surf_action_state_t cur) { + const char *name = getActionCpu(action)->getName(); + simgrid::surf::Host *host = static_cast(surf_host_resource_priv(sg_host_by_name(name))); + + HostEnergy *host_energy = (*surf_energy)[host]; + + if(host_energy->last_updated < surf_get_clock()) + update_consumption(host, host_energy); + + }); + + simgrid::surf::Host::onStateChange.connect([] + (simgrid::surf::Host *host, + e_surf_resource_state_t oldState, + e_surf_resource_state_t newState) { + HostEnergy *host_energy = (*surf_energy)[host]; + + if(host_energy->last_updated < surf_get_clock()) + update_consumption(host, host_energy); + }); + + simgrid::surf::surfExitCallbacks.connect([]() { + delete surf_energy; + surf_energy = NULL; + }); } } +namespace simgrid { +namespace energy { + /** * */ -HostEnergy::HostEnergy(Host *ptr) +HostEnergy::HostEnergy(simgrid::surf::Host *ptr) { host = ptr; total_energy = 0; @@ -170,29 +184,29 @@ HostEnergy::~HostEnergy(){ double HostEnergy::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", host->getName()); - xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(host->p_cpu)->getPState(), xbt_dynar_t); + xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, host->p_cpu->getPState(), xbt_dynar_t); double min_power = xbt_dynar_get_as(current_power_values, 0, double); return min_power; } double HostEnergy::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", host->getName()); - xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(host->p_cpu)->getPState(), xbt_dynar_t); + xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, host->p_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 - * - */ +/** @brief Computes the power consumed by the host according to the current pstate and processor load */ double HostEnergy::getCurrentWattsValue(double cpu_load) { xbt_dynar_t power_range_list = power_range_watts_list; xbt_assert(power_range_watts_list, "No power range properties specified for host %s", host->getName()); + int pstate = host->p_cpu->getPState(); + xbt_assert(pstate < (int)xbt_dynar_length(power_range_list), + "pstate %d >= power range amound %d",pstate,(int)xbt_dynar_length(power_range_list)); /* retrieve the power values associated with the current pstate */ - xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(host->p_cpu)->getPState(), xbt_dynar_t); + xbt_dynar_t current_power_values = xbt_dynar_get_as( power_range_list, pstate, xbt_dynar_t); /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ @@ -210,11 +224,9 @@ double HostEnergy::getCurrentWattsValue(double cpu_load) double HostEnergy::getConsumedEnergy() { - if(last_updated < surf_get_clock()) update_consumption(host, this); return total_energy; - } xbt_dynar_t HostEnergy::getWattsRangeList() @@ -261,3 +273,6 @@ xbt_dynar_t HostEnergy::getWattsRangeList() xbt_dynar_free(&all_power_values); return power_range_list; } + +} +}