X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/833c025434d4c8e9c4afc2dfa66bc9926a2c23a8..54a0d3535520d228f830d6d0397fa2b0b26293de:/src/surf/plugins/host_energy.cpp diff --git a/src/surf/plugins/host_energy.cpp b/src/surf/plugins/host_energy.cpp index e3e4977249..a84acc799b 100644 --- a/src/surf/plugins/host_energy.cpp +++ b/src/surf/plugins/host_energy.cpp @@ -3,12 +3,17 @@ /* 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 #include "simgrid/plugins/energy.h" #include "simgrid/simix.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/cpu_interface.hpp" + +#include +#include +#include +#include #include +#include /** @addtogroup SURF_plugin_energy @@ -225,14 +230,16 @@ void HostEnergy::initWattsRangeList() if (all_power_values_str == nullptr) return; - xbt_dynar_t all_power_values = xbt_str_split(all_power_values_str, ","); - int pstate_nb = xbt_dynar_length(all_power_values); + std::vector all_power_values; + boost::split(all_power_values, all_power_values_str, boost::is_any_of(",")); - for (int i = 0; i < pstate_nb; i++) { + int i = 0; + for (auto current_power_values_str : all_power_values) { /* 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) == 3, - "Power properties incorrectly defined - could not retrieve idle, min and max power values for host %s", + std::vector current_power_values; + boost::split(current_power_values, current_power_values_str, boost::is_any_of(":")); + xbt_assert(current_power_values.size() == 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) */ @@ -240,17 +247,15 @@ void HostEnergy::initWattsRangeList() 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)); + 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)); power_range_watts_list.push_back(range); xbt_free(msg_idle); xbt_free(msg_min); xbt_free(msg_max); - - xbt_dynar_free(¤t_power_values); + i++; } - xbt_dynar_free(&all_power_values); } } } @@ -305,45 +310,28 @@ static void onHostDestruction(simgrid::s4u::Host& host) HostEnergy* host_energy = host.extension(); host_energy->update(); - XBT_INFO("Total energy of host %s: %f Joules", host.cname(), host_energy->getConsumedEnergy()); + XBT_INFO("Energy consumption of host %s: %f Joules", host.cname(), host_energy->getConsumedEnergy()); } static void onSimulationEnd() { sg_host_t* host_list = sg_host_list(); int host_count = sg_host_count(); - double total_energy = 0.0; // Total energy consumption (whole plattform) + double total_energy = 0.0; // Total energy consumption (whole platform) double used_hosts_energy = 0.0; // Energy consumed by hosts that computed something for (int i = 0; i < host_count; i++) { - bool host_was_used = (host_list[i]->extension()->last_updated != 0); - double energy = 0.0; - energy = host_list[i]->extension()->getConsumedEnergy(); - total_energy += energy; - if (host_was_used) - used_hosts_energy += energy; + if (dynamic_cast(host_list[i]) == nullptr) { // Ignore virtual machines + + bool host_was_used = (host_list[i]->extension()->last_updated != 0); + double energy = host_list[i]->extension()->getConsumedEnergy(); + total_energy += energy; + if (host_was_used) + used_hosts_energy += energy; + } } - XBT_INFO("Summed energy consumption: %f Joules; used hosts consumed: %f Joules; unused (idle) hosts consumed: %f", + XBT_INFO("Total energy consumption: %f Joules (used hosts: %f Joules; unused/idle hosts: %f)", total_energy, used_hosts_energy, total_energy - used_hosts_energy); -} - -static int monitor_DVFS(int argc, char **argv); -static int monitor_DVFS(int argc, char **argv) -{ - while (1) { - MSG_process_sleep(5); - } - - return 0; -} - -static void onPlatformCreated() -{ - sg_host_t* host_list = sg_host_list(); - int host_count = sg_host_count(); - for (int i = 0; i < host_count; i++) { - MSG_process_create("dvfs", &monitor_DVFS, NULL, host_list[i]); - XBT_INFO("Created new MSG processes!"); - } + xbt_free(host_list); } /* **************************** Public interface *************************** */ @@ -364,7 +352,6 @@ void sg_host_energy_plugin_init() simgrid::s4u::Host::onStateChange.connect(&onHostChange); simgrid::s4u::Host::onSpeedChange.connect(&onHostChange); simgrid::s4u::Host::onDestruction.connect(&onHostDestruction); - simgrid::s4u::onPlatformCreated.connect(&onPlatformCreated); simgrid::s4u::onSimulationEnd.connect(&onSimulationEnd); simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange); }