X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ff60387c9140b46ec6bbcefe3897e9238bca79d..e9f0018b823e34405847177b25a85d3facc30ae1:/src/surf/plugins/energy.cpp diff --git a/src/surf/plugins/energy.cpp b/src/surf/plugins/energy.cpp index 33add3f7d4..6e4dc9fc1e 100644 --- a/src/surf/plugins/energy.cpp +++ b/src/surf/plugins/energy.cpp @@ -46,10 +46,10 @@ It starts at pstate 0 (ie, at 100 Mflop/s). In this case, you have to specify on In this example, the idle consumption is 95 Watts, 93 Watts and 90 Watts in each pstate while the CPU burn consumption are at 200 Watts, 170 Watts and 150 Watts respectively. -To change the pstate of a given CPU, use the following functions: #MSG_host_get_nb_pstates(), #MSG_host_set_pstate(), #MSG_host_get_power_peak_at(). +To change the pstate of a given CPU, use the following functions: #MSG_host_get_nb_pstates(), simgrid#s4u#Host#set_pstate(), #MSG_host_get_power_peak_at(). -To simulate the energy-related elements, first call the #sg_energy_plugin_init() before your #MSG_init(), -and then use the following function to retrieve the consumption of a given host: #MSG_host_get_consumed_energy(). +To simulate the energy-related elements, first call the simgrid#energy#sg_energy_plugin_init() before your #MSG_init(), +and then use the following function to retrieve the consumption of a given host: MSG_host_get_consumed_energy(). */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf, @@ -60,7 +60,7 @@ using simgrid::energy::HostEnergy; namespace simgrid { namespace energy { -simgrid::xbt::Extension HostEnergy::EXTENSION_ID; +simgrid::xbt::Extension HostEnergy::EXTENSION_ID; /* Computes the consumption so far. Called lazily on need. */ void HostEnergy::update() @@ -83,7 +83,7 @@ void HostEnergy::update() double previous_energy = this->total_energy; double instantaneous_consumption; - if (host->isOff()) + if (host->is_off()) instantaneous_consumption = this->watts_off; else instantaneous_consumption = this->getCurrentWattsValue(cpu_load); @@ -97,13 +97,14 @@ void HostEnergy::update() surf_host->getName(), start_time, finish_time, surf_host->p_cpu->m_speedPeak, previous_energy, energy_this_step); } -HostEnergy::HostEnergy(simgrid::Host *ptr) : +HostEnergy::HostEnergy(simgrid::s4u::Host *ptr) : host(ptr), last_updated(surf_get_clock()) { initWattsRangeList(); - if (host->getProperties() != NULL) { - char* off_power_str = (char*)xbt_dict_get_or_null(host->getProperties(), "watt_off"); + if (host->properties() != NULL) { + char* off_power_str = (char*)xbt_dict_get_or_null( + host->properties(), "watt_off"); if (off_power_str != NULL) watts_off = atof(off_power_str); else @@ -119,14 +120,14 @@ HostEnergy::~HostEnergy() double HostEnergy::getWattMinAt(int pstate) { xbt_assert(!power_range_watts_list.empty(), - "No power range properties specified for host %s", host->getName().c_str()); + "No power range properties specified for host %s", host->name().c_str()); return power_range_watts_list[pstate].first; } double HostEnergy::getWattMaxAt(int pstate) { xbt_assert(!power_range_watts_list.empty(), - "No power range properties specified for host %s", host->getName().c_str()); + "No power range properties specified for host %s", host->name().c_str()); return power_range_watts_list[pstate].second; } @@ -134,11 +135,11 @@ double HostEnergy::getWattMaxAt(int pstate) double HostEnergy::getCurrentWattsValue(double cpu_load) { xbt_assert(!power_range_watts_list.empty(), - "No power range properties specified for host %s", host->getName().c_str()); + "No power range properties specified for host %s", host->name().c_str()); /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ - auto range = power_range_watts_list.at(host->getPState()); + auto range = power_range_watts_list.at(host->pstate()); double min_power = range.first; double max_power = range.second; double power_slope = max_power - min_power; @@ -160,10 +161,10 @@ double HostEnergy::getConsumedEnergy() void HostEnergy::initWattsRangeList() { - if (host->getProperties() == NULL) + if (host->properties() == NULL) return; char* all_power_values_str = - (char*)xbt_dict_get_or_null(host->getProperties(), "watt_per_state"); + (char*)xbt_dict_get_or_null(host->properties(), "watt_per_state"); if (all_power_values_str == NULL) return; @@ -177,7 +178,7 @@ void HostEnergy::initWattsRangeList() 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->getName().c_str()); + host->name().c_str()); /* min_power corresponds to the idle power (cpu load = 0) */ /* max_power is the power consumed at 100% cpu load */ @@ -193,14 +194,14 @@ void HostEnergy::initWattsRangeList() } /* **************************** events callback *************************** */ -static void onCreation(simgrid::surf::Host *host) { - if (dynamic_cast(host)) // Ignore virtual machines +static void onCreation(simgrid::s4u::Host& host) { + simgrid::surf::Host* surf_host = host.extension(); + if (dynamic_cast(surf_host)) // Ignore virtual machines return; - host->p_host->extension_set(new HostEnergy(host->p_host)); + host.extension_set(new HostEnergy(&host)); } -static void onActionStateChange(simgrid::surf::CpuAction *action, - e_surf_action_state_t old, e_surf_action_state_t cur) { +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); @@ -213,23 +214,26 @@ static void onActionStateChange(simgrid::surf::CpuAction *action, host_energy->update(); } -static void onHostStateChange(simgrid::surf::Host *host) { - if (dynamic_cast(host)) // Ignore virtual machines +static void onHostStateChange(simgrid::s4u::Host &host) { + simgrid::surf::Host* surf_host = host.extension(); + if (dynamic_cast(surf_host)) // Ignore virtual machines return; - HostEnergy *host_energy = host->p_host->extension(); + HostEnergy *host_energy = host.extension(); if(host_energy->last_updated < surf_get_clock()) host_energy->update(); } -static void onHostDestruction(simgrid::surf::Host *host) { +static void onHostDestruction(simgrid::s4u::Host& host) { // Ignore virtual machines - if (dynamic_cast(host)) + simgrid::surf::Host* surf_host = host.extension(); + if (dynamic_cast(surf_host)) return; - HostEnergy *host_energy = host->p_host->extension(); + HostEnergy *host_energy = host.extension(); host_energy->update(); - XBT_INFO("Total energy of host %s: %f Joules", host->getName(), host_energy->getConsumedEnergy()); + XBT_INFO("Total energy of host %s: %f Joules", + host.name().c_str(), host_energy->getConsumedEnergy()); } /* **************************** Public interface *************************** */ @@ -242,12 +246,12 @@ void sg_energy_plugin_init(void) if (HostEnergy::EXTENSION_ID.valid()) return; - HostEnergy::EXTENSION_ID = simgrid::Host::extension_create(); + HostEnergy::EXTENSION_ID = simgrid::s4u::Host::extension_create(); - simgrid::surf::Host::onCreation.connect(&onCreation); + simgrid::s4u::Host::onCreation.connect(&onCreation); + simgrid::s4u::Host::onStateChange.connect(&onHostStateChange); + simgrid::s4u::Host::onDestruction.connect(&onHostDestruction); simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange); - simgrid::surf::Host::onStateChange.connect(&onHostStateChange); - simgrid::surf::Host::onDestruction.connect(&onHostDestruction); } /** @brief Returns the total energy consumed by the host so far (in Joules)