X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/294abae394b07a295a04f7b1dd374ad1b15f9998..b8ceec9dcbf950163eb1328573830d360ace02ee:/src/plugins/host_energy.cpp diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index 81f1162a12..6d9483d501 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -1,16 +1,17 @@ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "simgrid/Exception.hpp" -#include "simgrid/plugins/energy.h" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Exec.hpp" -#include "src/include/surf/surf.hpp" -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" -#include "src/surf/cpu_interface.hpp" +#include +#include +#include +#include +#include +#include +#include + +#include "src/kernel/resource/CpuImpl.hpp" #include #include @@ -109,13 +110,12 @@ before you can get accurate energy predictions. @endrst */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_energy, surf, "Logging specific to the SURF energy plugin"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host_energy, kernel, "Logging specific to the host energy plugin"); // Forwards declaration needed to make this function a friend (because friends have external linkage by default) static void on_simulation_end(); -namespace simgrid { -namespace plugin { +namespace simgrid::plugin { class PowerRange { public: @@ -140,7 +140,7 @@ class HostEnergy { const int pstate_off_ = -1; double watts_off_ = 0.0; /*< Consumption when the machine is turned off (shutdown) */ double total_energy_ = 0.0; /*< Total energy consumed by the host */ - double last_updated_ = surf_get_clock(); /*< Timestamp of the last energy update event*/ + double last_updated_ = simgrid::s4u::Engine::get_clock(); /*< Timestamp of the last energy update event*/ /* Only used to split total energy into unused/used hosts. * If you want to get this info for something else, rather use the host_load plugin @@ -180,7 +180,7 @@ bool HostEnergy::has_pstate_power_values() const { void HostEnergy::update() { double start_time = last_updated_; - double finish_time = surf_get_clock(); + double finish_time = simgrid::s4u::Engine::get_clock(); // // We may have start == finish if the past consumption was updated since the simcall was started // for example if 2 actors requested to update the same host's consumption in a given scheduling round. @@ -331,8 +331,8 @@ double HostEnergy::get_current_watts_value(double cpu_load) const double HostEnergy::get_consumed_energy() { - if (last_updated_ < surf_get_clock()) // We need to simcall this as it modifies the environment - simgrid::kernel::actor::simcall(std::bind(&HostEnergy::update, this)); + if (last_updated_ < simgrid::s4u::Engine::get_clock()) // We need to simcall this as it modifies the environment + simgrid::kernel::actor::simcall_answered(std::bind(&HostEnergy::update, this)); return total_energy_; } @@ -349,8 +349,8 @@ void HostEnergy::init_watts_range_list() boost::split(all_power_values, all_power_values_str, boost::is_any_of(",")); XBT_DEBUG("%s: power properties: %s", host_->get_cname(), all_power_values_str); - xbt_assert(all_power_values.size() == (unsigned)host_->get_pstate_count(), - "Invalid XML file. Found %zu energetic profiles for %d pstates", all_power_values.size(), + xbt_assert(all_power_values.size() == host_->get_pstate_count(), + "Invalid XML file. Found %zu energetic profiles for %lu pstates", all_power_values.size(), host_->get_pstate_count()); int i = 0; @@ -390,8 +390,7 @@ void HostEnergy::init_watts_range_list() has_pstate_power_values_ = true; } -} // namespace plugin -} // namespace simgrid +} // namespace simgrid::plugin using simgrid::plugin::HostEnergy; @@ -413,14 +412,13 @@ static void on_action_state_change(simgrid::kernel::resource::CpuAction const& a simgrid::s4u::Host* host = cpu->get_iface(); if (host != nullptr) { // If it's a VM, take the corresponding PM - const simgrid::s4u::VirtualMachine* vm = dynamic_cast(host); - if (vm) // If it's a VM, take the corresponding PM + if (const auto* vm = dynamic_cast(host)) host = vm->get_pm(); // Get the host_energy extension for the relevant host auto* host_energy = host->extension(); - if (host_energy->get_last_update_time() < surf_get_clock()) + if (host_energy->get_last_update_time() < simgrid::s4u::Engine::get_clock()) host_energy->update(); } } @@ -476,11 +474,11 @@ void sg_host_energy_plugin_init() HostEnergy::EXTENSION_ID = simgrid::s4u::Host::extension_create(); - simgrid::s4u::Host::on_creation.connect(&on_creation); - simgrid::s4u::Host::on_state_change.connect(&on_host_change); - simgrid::s4u::Host::on_speed_change.connect(&on_host_change); - simgrid::s4u::Host::on_destruction.connect(&on_host_destruction); - simgrid::s4u::Engine::on_simulation_end.connect(&on_simulation_end); + simgrid::s4u::Host::on_creation_cb(&on_creation); + simgrid::s4u::Host::on_state_change_cb(&on_host_change); + simgrid::s4u::Host::on_speed_change_cb(&on_host_change); + simgrid::s4u::Host::on_destruction_cb(&on_host_destruction); + simgrid::s4u::Engine::on_simulation_end_cb(&on_simulation_end); simgrid::kernel::resource::CpuAction::on_state_change.connect(&on_action_state_change); // We may only have one actor on a node. If that actor executes something like // compute -> recv -> compute @@ -488,11 +486,10 @@ void sg_host_energy_plugin_init() // that the next trigger would be the 2nd compute, hence ignoring the idle time // during the recv call. By updating at the beginning of a compute, we can // fix that. (If the cpu is not idle, this is not required.) - simgrid::s4u::Exec::on_start.connect([](simgrid::s4u::Exec const& activity) { + simgrid::s4u::Exec::on_start_cb([](simgrid::s4u::Exec const& activity) { if (activity.get_host_number() == 1) { // We only run on one host simgrid::s4u::Host* host = activity.get_host(); - const simgrid::s4u::VirtualMachine* vm = dynamic_cast(host); - if (vm != nullptr) + if (const auto* vm = dynamic_cast(host)) host = vm->get_pm(); xbt_assert(host != nullptr); host->extension()->update(); @@ -508,7 +505,7 @@ void sg_host_energy_plugin_init() */ void sg_host_energy_update_all() { - simgrid::kernel::actor::simcall([]() { + simgrid::kernel::actor::simcall_answered([]() { std::vector list = simgrid::s4u::Engine::get_instance()->get_all_hosts(); for (auto const& host : list) if (dynamic_cast(host) == nullptr) { // Ignore virtual machines