X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e00312bf86c3868d644b7806cdba0abf23664a4..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/plugins/energy.cpp diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index b76c9132a2..b1b51c9c54 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -5,7 +5,7 @@ #include "simgrid/plugins/energy.h" #include "simgrid/simix.hpp" -#include "src/surf/VirtualMachineImpl.hpp" +#include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/plugins/energy.hpp" #include @@ -103,7 +103,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->name().c_str(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy, energy_this_step); + host->cname(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy, energy_this_step); } HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_get_clock()) @@ -113,7 +113,7 @@ HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_g if (host->properties() != nullptr) { char* off_power_str = (char*)xbt_dict_get_or_null(host->properties(), "watt_off"); if (off_power_str != nullptr) { - char *msg = bprintf("Invalid value for property watt_off of host %s: %%s",host->name().c_str()); + char* msg = bprintf("Invalid value for property watt_off of host %s: %%s", host->cname()); watts_off = xbt_str_parse_double(off_power_str, msg); xbt_free(msg); } @@ -126,20 +126,20 @@ HostEnergy::~HostEnergy()=default; double HostEnergy::getWattMinAt(int pstate) { - xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str()); + xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->cname()); return power_range_watts_list[pstate].min; } double HostEnergy::getWattMaxAt(int pstate) { - xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str()); + xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->cname()); return power_range_watts_list[pstate].max; } /** @brief Computes the power consumed by the host according to the current pstate and processor load */ double HostEnergy::getCurrentWattsValue(double cpu_load) { - xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->name().c_str()); + xbt_assert(!power_range_watts_list.empty(), "No power range properties specified for host %s", host->cname()); /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ @@ -205,21 +205,22 @@ void HostEnergy::initWattsRangeList() for (int i=0; i< pstate_nb; i++) { /* retrieve the power values associated with the current pstate */ xbt_dynar_t current_power_values = xbt_str_split(xbt_dynar_get_as(all_power_values, i, char*), ":"); - xbt_assert(xbt_dynar_length(current_power_values) > 1, - "Power properties incorrectly defined - could not retrieve min and max power values for host %s", - host->name().c_str()); + xbt_assert(xbt_dynar_length(current_power_values) == 3, + "Power properties incorrectly defined - could not retrieve idle, min and max power values for host %s", + host->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->name().c_str()); - char *msg_min = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->name().c_str()); - char *msg_max = bprintf("Invalid max value for pstate %d on host %s: %%s", i, host->name().c_str()); + char* msg_idle = bprintf("Invalid idle value for pstate %d on host %s: %%s", i, host->cname()); + char* msg_min = bprintf("Invalid min value for pstate %d on host %s: %%s", i, host->cname()); + char* msg_max = bprintf("Invalid max value for pstate %d on host %s: %%s", i, host->cname()); PowerRange range( xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 0, char*), msg_idle), xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 1, char*), msg_min), xbt_str_parse_double(xbt_dynar_get_as(current_power_values, 2, char*), msg_max) ); power_range_watts_list.push_back(range); + xbt_free(msg_idle); xbt_free(msg_min); xbt_free(msg_max); @@ -233,7 +234,7 @@ void HostEnergy::initWattsRangeList() /* **************************** events callback *************************** */ static void onCreation(simgrid::s4u::Host& host) { - if (dynamic_cast(host.pimpl_)) // Ignore virtual machines + if (dynamic_cast(&host)) // Ignore virtual machines return; host.extension_set(new HostEnergy(&host)); } @@ -245,9 +246,9 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf: if(sghost == nullptr) continue; simgrid::surf::HostImpl* host = sghost->pimpl_; - simgrid::surf::VirtualMachineImpl* vm = dynamic_cast(host); + simgrid::s4u::VirtualMachine* vm = dynamic_cast(sghost); if (vm) // If it's a VM, take the corresponding PM - host = vm->getPm()->pimpl_; + host = vm->pimpl_vm_->getPm()->pimpl_; HostEnergy *host_energy = host->piface_->extension(); @@ -257,7 +258,7 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, simgrid::surf: } static void onHostStateChange(simgrid::s4u::Host &host) { - if (dynamic_cast(host.pimpl_)) // Ignore virtual machines + if (dynamic_cast(&host)) // Ignore virtual machines return; HostEnergy *host_energy = host.extension(); @@ -268,11 +269,11 @@ static void onHostStateChange(simgrid::s4u::Host &host) { static void onHostDestruction(simgrid::s4u::Host& host) { // Ignore virtual machines - if (dynamic_cast(host.pimpl_)) + if (dynamic_cast(&host)) return; HostEnergy *host_energy = host.extension(); host_energy->update(); - XBT_INFO("Total energy of host %s: %f Joules", host.name().c_str(), host_energy->getConsumedEnergy()); + XBT_INFO("Total energy of host %s: %f Joules", host.cname(), host_energy->getConsumedEnergy()); } /* **************************** Public interface *************************** */