XBT_DEBUG("[update_energy of %s] period=[%.2f-%.2f]; current power peak=%.0E flop/s; consumption change: %.2f J -> "
"%.2f J",
- host->get_cname(), start_time, finish_time, host->pimpl_cpu->speed_.peak, previous_energy,
+ host->get_cname(), start_time, finish_time, host->pimpl_cpu->getSpeed(1.0), previous_energy,
energy_this_step);
}
/* Save data for the upcoming time interval: whether it's on/off and the pstate if it's on */
- this->pstate = host->isOn() ? host->getPstate() : pstate_off;
+ this->pstate = host->is_on() ? host->getPstate() : pstate_off;
}
HostEnergy::HostEnergy(simgrid::s4u::Host* ptr) : host(ptr), last_updated(surf_get_clock())
{
initWattsRangeList();
- const char* off_power_str = host->getProperty("watt_off");
+ const char* off_power_str = host->get_property("watt_off");
if (off_power_str != nullptr) {
try {
this->watts_off = std::stod(std::string(off_power_str));
cpu_load = host->pimpl_cpu->get_constraint()->get_usage() / current_speed;
/** Divide by the number of cores here **/
- cpu_load /= host->pimpl_cpu->coreCount();
+ cpu_load /= host->pimpl_cpu->get_cores_count();
if (cpu_load > 1) // A machine with a load > 1 consumes as much as a fully loaded machine, not more
cpu_load = 1;
void HostEnergy::initWattsRangeList()
{
- const char* all_power_values_str = host->getProperty("watt_per_state");
+ const char* all_power_values_str = host->get_property("watt_per_state");
if (all_power_values_str == nullptr)
return;
static void onActionStateChange(simgrid::surf::CpuAction* action, simgrid::kernel::resource::Action::State previous)
{
for (simgrid::surf::Cpu* const& cpu : action->cpus()) {
- simgrid::s4u::Host* host = cpu->getHost();
+ simgrid::s4u::Host* host = cpu->get_host();
if (host != nullptr) {
// If it's a VM, take the corresponding PM
HostEnergy::EXTENSION_ID = simgrid::s4u::Host::extension_create<HostEnergy>();
- simgrid::s4u::Host::onCreation.connect(&onCreation);
- simgrid::s4u::Host::onStateChange.connect(&onHostChange);
- simgrid::s4u::Host::onSpeedChange.connect(&onHostChange);
- simgrid::s4u::Host::onDestruction.connect(&onHostDestruction);
+ simgrid::s4u::Host::on_creation.connect(&onCreation);
+ simgrid::s4u::Host::on_state_change.connect(&onHostChange);
+ simgrid::s4u::Host::on_speed_change.connect(&onHostChange);
+ simgrid::s4u::Host::on_destruction.connect(&onHostDestruction);
simgrid::s4u::on_simulation_end.connect(&onSimulationEnd);
simgrid::surf::CpuAction::onStateChange.connect(&onActionStateChange);
}