X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c98af3dcf6ab83a095d195accad6943379ab220..9789ab443456db17ab488320128d58373e81cc7d:/src/surf/plugins/host_energy.cpp
diff --git a/src/surf/plugins/host_energy.cpp b/src/surf/plugins/host_energy.cpp
index 0b3ca1d3b5..8e3fa2da23 100644
--- a/src/surf/plugins/host_energy.cpp
+++ b/src/surf/plugins/host_energy.cpp
@@ -45,7 +45,7 @@ AllCores is 200 Watts.
This is enough to compute the consumption as a function of the amount of loaded cores:
-#Cores loaded | Consumption | Explanation |
+\#Cores loaded | Consumption | Explanation |
0 | 100 Watts | Idle value |
1 | 120 Watts | OneCore value |
2 | 147 Watts | linear extrapolation between OneCore and AllCores |
@@ -171,19 +171,19 @@ void HostEnergy::update()
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));
@@ -235,7 +235,7 @@ double HostEnergy::getCurrentWattsValue()
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;
@@ -307,14 +307,14 @@ double HostEnergy::getCurrentWattsValue(double cpu_load)
double HostEnergy::getConsumedEnergy()
{
if (last_updated < surf_get_clock()) // We need to simcall this as it modifies the environment
- simgrid::simix::kernelImmediate(std::bind(&HostEnergy::update, this));
+ simgrid::simix::simcall(std::bind(&HostEnergy::update, this));
return total_energy;
}
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;
@@ -384,7 +384,7 @@ static void onCreation(simgrid::s4u::Host& host)
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
@@ -424,7 +424,7 @@ static void onHostDestruction(simgrid::s4u::Host& host)
static void onSimulationEnd()
{
- std::vector hosts = simgrid::s4u::Engine::getInstance()->getAllHosts();
+ std::vector hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts();
double total_energy = 0.0; // Total energy consumption (whole platform)
double used_hosts_energy = 0.0; // Energy consumed by hosts that computed something
@@ -457,11 +457,11 @@ void sg_host_energy_plugin_init()
HostEnergy::EXTENSION_ID = simgrid::s4u::Host::extension_create();
- 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::onSimulationEnd.connect(&onSimulationEnd);
+ 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);
}
@@ -473,8 +473,8 @@ void sg_host_energy_plugin_init()
*/
void sg_host_energy_update_all()
{
- simgrid::simix::kernelImmediate([]() {
- std::vector list = simgrid::s4u::Engine::getInstance()->getAllHosts();
+ simgrid::simix::simcall([]() {
+ std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
for (auto const& host : list)
if (dynamic_cast(host) == nullptr) // Ignore virtual machines
host->extension()->update();