X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2eb85cd0c98bcbc806d67fddc959440befdddeab..2119e6533d557066a41c25915f77b2e64a5ba812:/src/plugins/host_load.cpp diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp index 5399de2439..5387b3c214 100644 --- a/src/plugins/host_load.cpp +++ b/src/plugins/host_load.cpp @@ -4,7 +4,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/plugins/load.h" +#include "src/include/surf/surf.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include + +SIMGRID_REGISTER_PLUGIN(host_load, "Cpu load", &sg_host_load_plugin_init) /** @addtogroup plugin_load @@ -25,10 +29,9 @@ public: : host_(ptr) , last_updated_(surf_get_clock()) , last_reset_(surf_get_clock()) - , current_speed_(host_->getSpeed()) + , current_speed_(host_->get_speed()) , current_flops_(host_->pimpl_cpu->get_constraint()->get_usage()) , theor_max_flops_(0) - , was_prev_idle_(current_flops_ == 0) { } ~HostLoad() = default; @@ -40,6 +43,7 @@ public: double get_average_load() { return (theor_max_flops_ == 0) ? 0 : computed_flops_ / theor_max_flops_; }; double get_computed_flops() { return computed_flops_; } double get_idle_time() { return idle_time_; } /** Return idle time since last reset */ + double get_total_idle_time() { return total_idle_time_; } /** Return idle time over the whole simulation */ void update(); void reset(); @@ -48,7 +52,8 @@ private: double last_updated_ = 0; double last_reset_ = 0; /** - * current_speed each core is running at right now + * current_speed each core is running at; we need to store this as the speed + * will already have changed once we get notified */ double current_speed_ = 0; /** @@ -58,8 +63,8 @@ private: double current_flops_ = 0; double computed_flops_ = 0; double idle_time_ = 0; + double total_idle_time_ = 0; /* This gets never reset */ double theor_max_flops_ = 0; - bool was_prev_idle_ = true; /* A host is idle at the beginning */ }; simgrid::xbt::Extension HostLoad::EXTENSION_ID; @@ -68,21 +73,22 @@ void HostLoad::update() { double now = surf_get_clock(); - /* Current flop per second computed by the cpu; current_flops = k * pstate_speed_in_flops, k \in {0, 1, ..., cores} - * number of active cores */ + /* Current flop per second computed by the cpu; current_flops = k * pstate_speed_in_flops, k @in {0, 1, ..., cores-1} + * designates number of active cores; will be 0 if CPU is currently idle */ current_flops_ = host_->pimpl_cpu->get_constraint()->get_usage(); /* flops == pstate_speed * cores_being_currently_used */ computed_flops_ += (now - last_updated_) * current_flops_; - if (was_prev_idle_) { + if (current_flops_ == 0) { idle_time_ += (now - last_updated_); + total_idle_time_ += (now - last_updated_); + XBT_DEBUG("[%s]: Currently idle -> Added %f seconds to idle time (totaling %fs)", host_->get_cname(), (now - last_updated_), idle_time_); } theor_max_flops_ += current_speed_ * host_->get_core_count() * (now - last_updated_); - current_speed_ = host_->getSpeed(); + current_speed_ = host_->get_speed(); last_updated_ = now; - was_prev_idle_ = (current_flops_ == 0); } /** @@ -97,7 +103,7 @@ double HostLoad::get_current_load() { // We don't need to call update() here because it is called every time an action terminates or starts // FIXME: Can this happen at the same time? stop -> call to getCurrentLoad, load = 0 -> next action starts? - return current_flops_ / static_cast(host_->getSpeed() * host_->get_core_count()); + return current_flops_ / static_cast(host_->get_speed() * host_->get_core_count()); } /* @@ -111,8 +117,7 @@ void HostLoad::reset() computed_flops_ = 0; theor_max_flops_ = 0; current_flops_ = host_->pimpl_cpu->get_constraint()->get_usage(); - current_speed_ = host_->getSpeed(); - was_prev_idle_ = (current_flops_ == 0); + current_speed_ = host_->get_speed(); } } // namespace plugin } // namespace simgrid @@ -131,7 +136,7 @@ static void on_host_change(simgrid::s4u::Host& host) } /* This callback is called when an action (computation, idle, ...) terminates */ -static void on_action_state_change(simgrid::surf::CpuAction* action) +static void on_action_state_change(simgrid::surf::CpuAction* action, simgrid::kernel::resource::Action::State /*previous*/) { for (simgrid::surf::Cpu* const& cpu : action->cpus()) { simgrid::s4u::Host* host = cpu->get_host(); @@ -147,9 +152,9 @@ static void on_action_state_change(simgrid::surf::CpuAction* action) /* **************************** Public interface *************************** */ -/** \ingroup plugin_load - * \brief Initializes the HostLoad plugin - * \details The HostLoad plugin provides an API to get the current load of each host. +/** @ingroup plugin_load + * @brief Initializes the HostLoad plugin + * @details The HostLoad plugin provides an API to get the current load of each host. */ void sg_host_load_plugin_init() { @@ -158,6 +163,14 @@ void sg_host_load_plugin_init() HostLoad::EXTENSION_ID = simgrid::s4u::Host::extension_create(); + if (simgrid::s4u::Engine::is_initialized()) { // If not yet initialized, this would create a new instance + // which would cause seg faults... + simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance(); + for (auto& host : e->get_all_hosts()) { + host->extension_set(new HostLoad(host)); + } + } + /* When attaching a callback into a signal, you can use a lambda as follows, or a regular function as done below */ simgrid::s4u::Host::on_creation.connect([](simgrid::s4u::Host& host) { @@ -207,6 +220,14 @@ double sg_host_get_idle_time(sg_host_t host) return host->extension()->get_idle_time(); } +double sg_host_get_total_idle_time(sg_host_t host) +{ + xbt_assert(HostLoad::EXTENSION_ID.valid(), + "The Load plugin is not active. Please call sg_host_load_plugin_init() during initialization."); + + return host->extension()->get_total_idle_time(); +} + double sg_host_get_computed_flops(sg_host_t host) { xbt_assert(HostLoad::EXTENSION_ID.valid(),