From 5026d98d0656e9d0f9afb2aeecf09c314ea7a5f6 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 28 Nov 2015 22:27:53 +0100 Subject: [PATCH 1/1] reimplement energy plugin using Host callbacks (not Cpu ones) --- src/surf/plugins/energy.cpp | 117 ++++++++++++++++++----------------- src/surf/plugins/energy.hpp | 14 ++--- src/surf/surf_c_bindings.cpp | 12 ++-- 3 files changed, 72 insertions(+), 71 deletions(-) diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index c65b6f8974..0a7f9ab6d7 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -50,69 +50,70 @@ 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; +std::map *surf_energy=NULL; -static void energyCpuCreatedCallback(Cpu *cpu){ - (*surf_energy)[cpu] = new CpuEnergy(cpu); +static void energyHostCreatedCallback(Host *host){ + (*surf_energy)[host] = new HostEnergy(host); } 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 + 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 } /* 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; +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; + double start_time = host_energy->last_updated; double finish_time = surf_get_clock(); - double previous_energy = cpu_energy->total_energy; + double previous_energy = host_energy->total_energy; double instantaneous_consumption; - if (cpu->getState() == SURF_RESOURCE_OFF) - instantaneous_consumption = cpu_energy->watts_off; + if (host->getState() == SURF_RESOURCE_OFF) + instantaneous_consumption = host_energy->watts_off; else - instantaneous_consumption = cpu_energy->getCurrentWattsValue(cpu_load); + instantaneous_consumption = host_energy->getCurrentWattsValue(cpu_load); 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; + host_energy->total_energy = previous_energy + energy_this_step; + 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, cpu->m_powerPeak, previous_energy, energy_this_step); + start_time, finish_time, host->p_cpu->m_powerPeak, previous_energy, energy_this_step); } -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."); +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."); - CpuEnergy *cpu_energy = cpu_energy_it->second; - update_consumption(cpu, cpu_energy); + HostEnergy *host_energy = host_energy_it->second; + update_consumption(host, host_energy); - 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); + 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){ - Cpu *cpu = getActionCpu(action); + const char *name = getActionCpu(action)->getName(); + Host *host = static_cast(surf_host_resource_priv(sg_host_by_name(name))); - CpuEnergy *cpu_energy = (*surf_energy)[cpu]; + HostEnergy *host_energy = (*surf_energy)[host]; - if(cpu_energy->last_updated < surf_get_clock()) - update_consumption(cpu, cpu_energy); + if(host_energy->last_updated < surf_get_clock()) + update_consumption(host, host_energy); } -static void energyStateChangedCallback(Cpu *cpu, e_surf_resource_state_t oldState, e_surf_resource_state_t newState){ - CpuEnergy *cpu_energy = (*surf_energy)[cpu]; +static void energyStateChangedCallback(Host *host, e_surf_resource_state_t oldState, e_surf_resource_state_t newState){ + HostEnergy *host_energy = (*surf_energy)[host]; - if(cpu_energy->last_updated < surf_get_clock()) - update_consumption(cpu, cpu_energy); + if(host_energy->last_updated < surf_get_clock()) + update_consumption(host, host_energy); } static void sg_energy_plugin_exit() @@ -127,28 +128,28 @@ static void sg_energy_plugin_exit() */ void sg_energy_plugin_init() { if (surf_energy == NULL) { - surf_energy = new std::map(); - surf_callback_connect(cpuCreatedCallbacks, energyCpuCreatedCallback); + surf_energy = new std::map(); + surf_callback_connect(hostCreatedCallbacks, energyHostCreatedCallback); surf_callback_connect(VMCreatedCallbacks, energyVMCreatedCallback); - surf_callback_connect(cpuDestructedCallbacks, energyCpuDestructedCallback); + surf_callback_connect(hostDestructedCallbacks, energyHostDestructedCallback); surf_callback_connect(cpuActionStateChangedCallbacks, energyCpuActionStateChangedCallback); surf_callback_connect(surfExitCallbacks, sg_energy_plugin_exit); - surf_callback_connect(cpuStateChangedCallbacks, energyStateChangedCallback); + surf_callback_connect(hostStateChangedCallbacks, energyStateChangedCallback); } } /** * */ -CpuEnergy::CpuEnergy(Cpu *ptr) +HostEnergy::HostEnergy(Host *ptr) { - cpu = ptr; + host = ptr; total_energy = 0; power_range_watts_list = getWattsRangeList(); last_updated = surf_get_clock(); - if (cpu->getProperties() != NULL) { - char* off_power_str = (char*)xbt_dict_get_or_null(cpu->getProperties(), "watt_off"); + if (host->getProperties() != NULL) { + char* off_power_str = (char*)xbt_dict_get_or_null(host->getProperties(), "watt_off"); if (off_power_str != NULL) watts_off = atof(off_power_str); else @@ -157,7 +158,7 @@ CpuEnergy::CpuEnergy(Cpu *ptr) } -CpuEnergy::~CpuEnergy(){ +HostEnergy::~HostEnergy(){ unsigned int iter; xbt_dynar_t power_tuple = NULL; xbt_dynar_foreach(power_range_watts_list, iter, power_tuple) @@ -166,17 +167,17 @@ CpuEnergy::~CpuEnergy(){ } -double CpuEnergy::getWattMinAt(int pstate) { +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", cpu->getName()); - xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(cpu)->getPState(), xbt_dynar_t); + 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); double min_power = xbt_dynar_get_as(current_power_values, 0, double); return min_power; } -double CpuEnergy::getWattMaxAt(int pstate) { +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", cpu->getName()); - xbt_dynar_t current_power_values = xbt_dynar_get_as(power_range_list, static_cast(cpu)->getPState(), xbt_dynar_t); + 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); double max_power = xbt_dynar_get_as(current_power_values, 1, double); return max_power; } @@ -185,13 +186,13 @@ double CpuEnergy::getWattMaxAt(int pstate) { * Computes the power consumed by the host according to the current pstate and processor load * */ -double CpuEnergy::getCurrentWattsValue(double cpu_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", cpu->getName()); + xbt_assert(power_range_watts_list, "No power range properties specified for host %s", host->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(host->p_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 */ @@ -207,16 +208,16 @@ double CpuEnergy::getCurrentWattsValue(double cpu_load) return current_power; } -double CpuEnergy::getConsumedEnergy() +double HostEnergy::getConsumedEnergy() { if(last_updated < surf_get_clock()) - update_consumption(cpu, this); + update_consumption(host, this); return total_energy; } -xbt_dynar_t CpuEnergy::getWattsRangeList() +xbt_dynar_t HostEnergy::getWattsRangeList() { xbt_dynar_t power_range_list; xbt_dynar_t power_tuple; @@ -224,10 +225,10 @@ xbt_dynar_t CpuEnergy::getWattsRangeList() xbt_dynar_t current_power_values; double min_power, max_power; - if (cpu->getProperties() == NULL) + if (host->getProperties() == NULL) return NULL; - char* all_power_values_str = (char*)xbt_dict_get_or_null(cpu->getProperties(), "watt_per_state"); + char* all_power_values_str = (char*)xbt_dict_get_or_null(host->getProperties(), "watt_per_state"); if (all_power_values_str == NULL) return NULL; @@ -243,7 +244,7 @@ xbt_dynar_t CpuEnergy::getWattsRangeList() 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", - cpu->getName()); + host->getName()); /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ diff --git a/src/surf/plugins/energy.hpp b/src/surf/plugins/energy.hpp index f3d700c77b..a50a6f6e95 100644 --- a/src/surf/plugins/energy.hpp +++ b/src/surf/plugins/energy.hpp @@ -6,20 +6,20 @@ #include -#include "../cpu_interface.hpp" +#include "../host_interface.hpp" #include #ifndef ENERGY_CALLBACK_HPP_ #define ENERGY_CALLBACK_HPP_ -class XBT_PRIVATE CpuEnergy; +class XBT_PRIVATE HostEnergy; -extern XBT_PRIVATE std::map *surf_energy; +extern XBT_PRIVATE std::map *surf_energy; -class CpuEnergy { +class HostEnergy { public: - CpuEnergy(Cpu *ptr); - ~CpuEnergy(); + HostEnergy(Host *ptr); + ~HostEnergy(); double getCurrentWattsValue(double cpu_load); double getConsumedEnergy(); @@ -31,7 +31,7 @@ public: double watts_off; /*< Consumption when the machine is turned off (shutdown) */ double total_energy; /*< Total energy consumed by the host */ double last_updated; /*< Timestamp of the last energy update event*/ - Cpu *cpu; + Host *host; void unref() {if (--refcount == 0) delete this;} void ref() {refcount++;} diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 096bab428a..8f6185a516 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -292,19 +292,19 @@ int surf_host_get_pstate(surf_resource_t host){ } double surf_host_get_wattmin_at(surf_resource_t resource, int pstate){ xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); - return cpuIt->second->getWattMinAt(pstate); + std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); + return hostIt->second->getWattMinAt(pstate); } double surf_host_get_wattmax_at(surf_resource_t resource, int pstate){ xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); - return cpuIt->second->getWattMaxAt(pstate); + std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); + return hostIt->second->getWattMaxAt(pstate); } double surf_host_get_consumed_energy(surf_resource_t resource){ xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); - return cpuIt->second->getConsumedEnergy(); + std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); + return hostIt->second->getConsumedEnergy(); } xbt_dict_t surf_host_get_mounted_storage_list(surf_resource_t host){ -- 2.20.1