#include "simgrid/plugins/energy.h"
#include "simgrid/simix.hpp"
-#include "src/surf/plugins/energy.hpp"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/virtual_machine.hpp"
-
+#include "src/surf/plugins/energy.hpp"
#include <utility>
/** @addtogroup SURF_plugin_energy
/* Computes the consumption so far. Called lazily on need. */
void HostEnergy::update()
{
- simgrid::surf::HostImpl* surf_host = host->pimpl_;
double start_time = this->last_updated;
double finish_time = surf_get_clock();
double cpu_load;
- if (surf_host->cpu_->getPstateSpeedCurrent() <= 0)
+ if (host->pimpl_cpu->getPstateSpeedCurrent() <= 0)
// Some users declare a pstate of speed 0 flops (e.g., 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->cpu_->getConstraint()) / surf_host->cpu_->getPstateSpeedCurrent();
+ cpu_load = lmm_constraint_get_usage(host->pimpl_cpu->getConstraint()) / host->pimpl_cpu->getPstateSpeedCurrent();
/** Divide by the number of cores here **/
- cpu_load /= surf_host->cpu_->coreCount();
+ cpu_load /= host->pimpl_cpu->coreCount();
if (cpu_load > 1) // A machine with a load > 1 consumes as much as a fully loaded machine, not more
cpu_load = 1;
this->total_energy = previous_energy + energy_this_step;
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->cpu_->speed_.peak, previous_energy, energy_this_step);
+ XBT_DEBUG(
+ "[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> %.2f J",
+ 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())
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);
}
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 */
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);
/* **************************** events callback *************************** */
static void onCreation(simgrid::s4u::Host& host) {
- if (dynamic_cast<simgrid::surf::VirtualMachine*>(host.pimpl_)) // Ignore virtual machines
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
return;
host.extension_set(new HostEnergy(&host));
}
sg_host_t sghost = sg_host_by_name(name);
if(sghost == nullptr)
continue;
- simgrid::surf::HostImpl *host = sghost->pimpl_;
- simgrid::surf::VirtualMachine *vm = dynamic_cast<simgrid::surf::VirtualMachine*>(host);
+ simgrid::surf::HostImpl* host = sghost->pimpl_;
+ simgrid::s4u::VirtualMachine* vm = dynamic_cast<simgrid::s4u::VirtualMachine*>(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<HostEnergy>();
}
static void onHostStateChange(simgrid::s4u::Host &host) {
- if (dynamic_cast<simgrid::surf::VirtualMachine*>(host.pimpl_)) // Ignore virtual machines
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host)) // Ignore virtual machines
return;
HostEnergy *host_energy = host.extension<HostEnergy>();
static void onHostDestruction(simgrid::s4u::Host& host) {
// Ignore virtual machines
- if (dynamic_cast<simgrid::surf::VirtualMachine*>(host.pimpl_))
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host))
return;
HostEnergy *host_energy = host.extension<HostEnergy>();
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 *************************** */
