X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f89671e0bd7450461d70d5ced6079123e73c2a63..101c8b10d9965e115c9ff5c28954750a065cf155:/src/plugins/host_energy.cpp diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index 5cbb75c2c0..c7ea34026a 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -3,6 +3,7 @@ /* 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" @@ -18,7 +19,7 @@ SIMGRID_REGISTER_PLUGIN(host_energy, "Cpu energy consumption.", &sg_host_energy_ /** @defgroup plugin_host_energy - @rst + @beginrst This is the energy plugin, enabling to account not only for computation time, but also for the dissipated energy in the simulated platform. To activate this plugin, first call :cpp:func:`sg_host_energy_plugin_init()` before your :cpp:func:`MSG_init()`, and then use @@ -124,7 +125,24 @@ public: }; class HostEnergy { + simgrid::s4u::Host* host_ = nullptr; + /*< List of (idle_power, epsilon_power, max_power) tuple corresponding to each cpu pstate */ + std::vector power_range_watts_list_; + + /* We need to keep track of what pstate has been used, as we will sometimes be notified only *after* a pstate has been + * used (but we need to update the energy consumption with the old pstate!) + */ + int pstate_ = 0; + const int pstate_off_ = -1; + + /* 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 + */ + bool host_was_used_ = false; + + void init_watts_range_list(); friend void ::on_simulation_end(); // For access to host_was_used_ + public: static simgrid::xbt::Extension EXTENSION_ID; @@ -140,23 +158,6 @@ public: double get_power_range_slope_at(int pstate); void update(); -private: - void init_watts_range_list(); - simgrid::s4u::Host* host_ = nullptr; - /*< List of (idle_power, epsilon_power, max_power) tuple corresponding to each cpu pstate */ - std::vector power_range_watts_list_; - - /* We need to keep track of what pstate has been used, as we will sometimes be notified only *after* a pstate has been - * used (but we need to update the energy consumption with the old pstate!) - */ - int pstate_ = 0; - const int pstate_off_ = -1; - - /* 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 - */ - bool host_was_used_ = false; -public: 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_; /*< Timestamp of the last energy update event*/ @@ -460,7 +461,7 @@ static void on_creation(simgrid::s4u::Host& host) if (dynamic_cast(&host)) // Ignore virtual machines return; - // TODO Trace: set to zero the energy variable associated to host->getName() + // TODO Trace: set to zero the energy variable associated to host->get_name() host.extension_set(new HostEnergy(&host)); } @@ -471,7 +472,6 @@ static void on_action_state_change(simgrid::kernel::resource::CpuAction const& a for (simgrid::kernel::resource::Cpu* const& cpu : action.cpus()) { simgrid::s4u::Host* host = cpu->get_host(); if (host != nullptr) { - // If it's a VM, take the corresponding PM simgrid::s4u::VirtualMachine* vm = dynamic_cast(host); if (vm) // If it's a VM, take the corresponding PM @@ -515,7 +515,6 @@ static void on_simulation_end() double used_hosts_energy = 0.0; // Energy consumed by hosts that computed something for (size_t i = 0; i < hosts.size(); i++) { if (dynamic_cast(hosts[i]) == nullptr) { // Ignore virtual machines - double energy = hosts[i]->extension()->get_consumed_energy(); total_energy += energy; if (hosts[i]->extension()->host_was_used_) @@ -581,6 +580,13 @@ void sg_host_energy_update_all() }); } +static void ensure_plugin_inited() +{ + if (not HostEnergy::EXTENSION_ID.valid()) + throw simgrid::xbt::InitializationError("The Energy plugin is not active. Please call sg_host_energy_plugin_init() " + "before calling any function related to that plugin."); +} + /** @ingroup plugin_host_energy * @brief Returns the total energy consumed by the host so far (in Joules) * @@ -590,8 +596,7 @@ void sg_host_energy_update_all() */ double sg_host_get_consumed_energy(sg_host_t host) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_consumed_energy(); } @@ -600,8 +605,7 @@ double sg_host_get_consumed_energy(sg_host_t host) */ double sg_host_get_idle_consumption(sg_host_t host) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_idle_at(0); } @@ -610,8 +614,7 @@ double sg_host_get_idle_consumption(sg_host_t host) */ double sg_host_get_idle_consumption_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_idle_at(pstate); } @@ -620,8 +623,7 @@ double sg_host_get_idle_consumption_at(sg_host_t host, int pstate) */ double sg_host_get_wattmin_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_min_at(pstate); } /** @ingroup plugin_host_energy @@ -629,8 +631,7 @@ double sg_host_get_wattmin_at(sg_host_t host, int pstate) */ double sg_host_get_wattmax_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_watt_max_at(pstate); } /** @ingroup plugin_host_energy @@ -638,8 +639,7 @@ double sg_host_get_wattmax_at(sg_host_t host, int pstate) */ double sg_host_get_power_range_slope_at(sg_host_t host, int pstate) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_power_range_slope_at(pstate); } /** @ingroup plugin_host_energy @@ -647,7 +647,6 @@ double sg_host_get_power_range_slope_at(sg_host_t host, int pstate) */ double sg_host_get_current_consumption(sg_host_t host) { - xbt_assert(HostEnergy::EXTENSION_ID.valid(), - "The Energy plugin is not active. Please call sg_host_energy_plugin_init() during initialization."); + ensure_plugin_inited(); return host->extension()->get_current_watts_value(); }