X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..c84dc84beaec1cdcf7a49f1247cbc390414feaa0:/src/surf/plugins/energy.cpp?ds=sidebyside diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index 02ffe37163..c333364b4f 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -5,13 +5,12 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include -#include -#include -#include -#include -#include -#include +#include "simgrid/plugins/energy.h" +#include "simgrid/simix.hpp" +#include "src/surf/plugins/energy.hpp" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/virtual_machine.hpp" /** @addtogroup SURF_plugin_energy @@ -65,17 +64,17 @@ simgrid::xbt::Extension HostEnergy::EXTENSION_ID /* Computes the consumption so far. Called lazily on need. */ void HostEnergy::update() { - simgrid::surf::Host* surf_host = host->extension(); + simgrid::surf::HostImpl* surf_host = host->extension(); double start_time = this->last_updated; double finish_time = surf_get_clock(); double cpu_load; - if (surf_host->p_cpu->p_speed.peak == 0) + if (surf_host->p_cpu->speed_.peak == 0) // Some users declare a pstate of speed 0 flops (eg to model boot time). // We consider that the machine is then fully loaded. That's arbitrary but it avoids a NaN cpu_load = 1; else cpu_load = lmm_constraint_get_usage(surf_host->p_cpu->getConstraint()) - / surf_host->p_cpu->p_speed.peak; + / surf_host->p_cpu->speed_.peak; if (cpu_load > 1) // A machine with a load > 1 consumes as much as a fully loaded machine, not mores cpu_load = 1; @@ -83,7 +82,7 @@ void HostEnergy::update() double previous_energy = this->total_energy; double instantaneous_consumption; - if (host->is_off()) + if (host->isOff()) instantaneous_consumption = this->watts_off; else instantaneous_consumption = this->getCurrentWattsValue(cpu_load); @@ -94,7 +93,7 @@ void HostEnergy::update() this->last_updated = finish_time; XBT_DEBUG("[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J", - surf_host->getName(), start_time, finish_time, surf_host->p_cpu->p_speed.peak, previous_energy, energy_this_step); + surf_host->getName(), start_time, finish_time, surf_host->p_cpu->speed_.peak, previous_energy, energy_this_step); } HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : @@ -102,11 +101,13 @@ HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : { initWattsRangeList(); - if (host->properties() != NULL) { + if (host->properties() != nullptr) { char* off_power_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_off"); - if (off_power_str != NULL) - watts_off = xbt_str_parse_double(off_power_str, - bprintf("Invalid value for property watt_off of host %s: %%s",host->name().c_str())); + if (off_power_str != nullptr) { + char *msg = bprintf("Invalid value for property watt_off of host %s: %%s",host->name().c_str()); + watts_off = xbt_str_parse_double(off_power_str, msg); + xbt_free(msg); + } else watts_off = 0; } @@ -154,18 +155,18 @@ double HostEnergy::getCurrentWattsValue(double cpu_load) double HostEnergy::getConsumedEnergy() { if (last_updated < surf_get_clock()) // We need to simcall this as it modifies the environment - simgrid::simix::kernel(std::bind(&HostEnergy::update, this)); + simgrid::simix::kernelImmediate(std::bind(&HostEnergy::update, this)); return total_energy; } void HostEnergy::initWattsRangeList() { - if (host->properties() == NULL) + if (host->properties() == nullptr) return; char* all_power_values_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_per_state"); - if (all_power_values_str == NULL) + if (all_power_values_str == nullptr) return; xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ","); @@ -182,12 +183,14 @@ void HostEnergy::initWattsRangeList() /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ + char *msg_min = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str()); + char *msg_max = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str()); power_range_watts_list.push_back(power_range( - xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 0, char*), - bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str())), - xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 1, char*), - bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str())) + xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 0, char*), msg_min), + xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 1, char*), msg_max) )); + xbt_free(msg_min); + xbt_free(msg_max); xbt_dynar_free(¤t_power_values); } @@ -199,27 +202,32 @@ void HostEnergy::initWattsRangeList() /* **************************** events callback *************************** */ static void onCreation(simgrid::s4u::Host& host) { - simgrid::surf::Host* surf_host = host.extension(); + simgrid::surf::HostImpl* surf_host = host.extension(); if (dynamic_cast(surf_host)) // Ignore virtual machines return; host.extension_set(new HostEnergy(&host)); } -static void onActionStateChange(simgrid::surf::CpuAction *action, e_surf_action_state_t previous) { - const char *name = getActionCpu(action)->getName(); - simgrid::surf::Host *host = sg_host_by_name(name)->extension(); - simgrid::surf::VirtualMachine *vm = dynamic_cast(host); - if (vm) // If it's a VM, take the corresponding PM - host = vm->getPm()->extension(); - - HostEnergy *host_energy = host->p_host->extension(); - - if(host_energy->last_updated < surf_get_clock()) - host_energy->update(); +static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf::Action::State previous) { + for(simgrid::surf::Cpu* cpu : action->cpus()) { + const char *name = cpu->getName(); + sg_host_t sghost = sg_host_by_name(name); + if(sghost == nullptr) + continue; + simgrid::surf::HostImpl *host = sghost->extension(); + simgrid::surf::VirtualMachine *vm = dynamic_cast(host); + if (vm) // If it's a VM, take the corresponding PM + host = vm->getPm()->extension(); + + HostEnergy *host_energy = host->piface->extension(); + + if(host_energy->last_updated < surf_get_clock()) + host_energy->update(); + } } static void onHostStateChange(simgrid::s4u::Host &host) { - simgrid::surf::Host* surf_host = host.extension(); + simgrid::surf::HostImpl* surf_host = host.extension(); if (dynamic_cast(surf_host)) // Ignore virtual machines return; @@ -231,7 +239,7 @@ static void onHostStateChange(simgrid::s4u::Host &host) { static void onHostDestruction(simgrid::s4u::Host& host) { // Ignore virtual machines - simgrid::surf::Host* surf_host = host.extension(); + simgrid::surf::HostImpl* surf_host = host.extension(); if (dynamic_cast(surf_host)) return; HostEnergy *host_energy = host.extension();