#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->extension<simgrid::surf::HostImpl>();
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_->getCoreCount();
+ 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->name().c_str(), 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())
* (maxCpuLoad is by definition 1)
*/
double power_slope;
- int coreCount = host->coresCount();
+ int coreCount = host->coreCount();
+ double coreReciprocal = static_cast<double>(1) / static_cast<double>(coreCount);
if (coreCount > 1)
- power_slope = (max_power - min_power) / (1 - 1 / coreCount);
+ power_slope = (max_power - min_power) / (1 - coreReciprocal);
else
power_slope = 0; // Should be 0, since max_power == min_power (in this case)
- current_power = min_power + (cpu_load - (1 / coreCount)) * power_slope;
+ current_power = min_power + (cpu_load - coreReciprocal) * power_slope;
}
else { /* Our machine is idle, take the dedicated value! */
current_power = range.idle;
/* **************************** events callback *************************** */
static void onCreation(simgrid::s4u::Host& host) {
- simgrid::surf::HostImpl* surf_host = host.extension<simgrid::surf::HostImpl>();
- if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host)) // 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->extension<simgrid::surf::HostImpl>();
- 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()->extension<simgrid::surf::HostImpl>();
+ host = vm->pimpl_vm_->getPm()->pimpl_;
HostEnergy *host_energy = host->piface_->extension<HostEnergy>();
}
static void onHostStateChange(simgrid::s4u::Host &host) {
- simgrid::surf::HostImpl* surf_host = host.extension<simgrid::surf::HostImpl>();
- if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host)) // 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
- simgrid::surf::HostImpl* surf_host = host.extension<simgrid::surf::HostImpl>();
- if (dynamic_cast<simgrid::surf::VirtualMachine*>(surf_host))
+ if (dynamic_cast<simgrid::s4u::VirtualMachine*>(&host))
return;
HostEnergy *host_energy = host.extension<HostEnergy>();
host_energy->update();