X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f5cc4e090af49a98da0e25e9ee21a8ce6ce30f8..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/plugins/host_load.cpp diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp index 6f00606d8b..3484d05f69 100644 --- a/src/plugins/host_load.cpp +++ b/src/plugins/host_load.cpp @@ -1,13 +1,16 @@ -/* 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 -#include +#include +#include +#include +#include #include "src/kernel/activity/ExecImpl.hpp" -#include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/surf/surf_interface.hpp" // Makes sure that this plugin can be activated from the command line with ``--cfg=plugin:host_load`` SIMGRID_REGISTER_PLUGIN(host_load, "Cpu load", &sg_host_load_plugin_init) @@ -18,18 +21,18 @@ SIMGRID_REGISTER_PLUGIN(host_load, "Cpu load", &sg_host_load_plugin_init) In addition, this constitutes a good introductory example on how to write a plugin. It attaches an extension to each host to store some data, and places callbacks in the following signals: - - :cpp:member:`simgrid::s4u::Host::on_creation`: Attach a new extension to the newly created host. - - :cpp:member:`simgrid::s4u::Exec::on_start`: Make note that a new execution started, increasing the load. - - :cpp:member:`simgrid::s4u::Exec::on_completion`: Make note that an execution completed, decreasing the load. - - :cpp:member:`simgrid::s4u::Host::on_state_change`: Do what is appropriate when the host gets suspended, turned off + - :cpp:func:`simgrid::s4u::Host::on_creation_cb`: Attach a new extension to the newly created host. + - :cpp:func:`simgrid::s4u::Exec::on_start_cb`: Make note that a new execution started, increasing the load. + - :cpp:func:`simgrid::s4u::Exec::on_completion_cb`: Make note that an execution completed, decreasing the load. + - :cpp:func:`simgrid::s4u::Host::on_state_change_cb`: Do what is appropriate when the host gets suspended, turned off or similar. - - :cpp:member:`simgrid::s4u::Host::on_speed_change`: Do what is appropriate when the DVFS is modified. + - :cpp:func:`simgrid::s4u::Host::on_speed_change_cb`: Do what is appropriate when the DVFS is modified. Note that extensions are automatically destroyed when the host gets destroyed. @endrst */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_plugin_load, surf, "Logging specific to the HostLoad plugin"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host_load, kernel, "Logging specific to the HostLoad plugin"); namespace simgrid { namespace plugin { @@ -126,14 +129,15 @@ void HostLoad::update() auto current_iter = iter; ++iter; - if (action != nullptr && action->get_finish_time() != now && activity->state_ == kernel::activity::State::RUNNING) { + if (action != nullptr && action->get_finish_time() != now && + activity->get_state() == kernel::activity::State::RUNNING) { if (remaining_cost_after_last_update == activity_uninitialized_remaining_cost) { remaining_cost_after_last_update = action->get_cost(); } double computed_flops_since_last_update = remaining_cost_after_last_update - /*remaining now*/activity->get_remaining(); computed_flops_ += computed_flops_since_last_update; remaining_cost_after_last_update = activity->get_remaining(); - } else if (activity->state_ == kernel::activity::State::DONE) { + } else if (activity->get_state() == kernel::activity::State::DONE) { computed_flops_ += remaining_cost_after_last_update; current_activities.erase(current_iter); } @@ -224,13 +228,13 @@ void sg_host_load_plugin_init() } // Make sure that every future host also gets an extension (in case the platform is not loaded yet) - simgrid::s4u::Host::on_creation.connect([](simgrid::s4u::Host& host) { + simgrid::s4u::Host::on_creation_cb([](simgrid::s4u::Host& host) { if (dynamic_cast(&host)) // Ignore virtual machines return; host.extension_set(new HostLoad(&host)); }); - 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); @@ -246,21 +250,23 @@ void sg_host_load_plugin_init() XBT_WARN("HostLoad plugin currently does not support executions on several hosts"); } }); - simgrid::s4u::Exec::on_completion.connect([](simgrid::s4u::Exec const& activity) { - if (activity.get_host_number() == 1) { // We only run on one host - simgrid::s4u::Host* host = activity.get_host(); + simgrid::s4u::Activity::on_completion_cb([](simgrid::s4u::Activity const& activity) { + const auto* exec = dynamic_cast(&activity); + if (exec == nullptr) // Only Execs are concerned here + return; + if (exec->get_host_number() == 1) { // We only run on one host + simgrid::s4u::Host* host = exec->get_host(); const simgrid::s4u::VirtualMachine* vm = dynamic_cast(host); if (vm != nullptr) host = vm->get_pm(); xbt_assert(host != nullptr); host->extension()->update(); - } - else { // This runs on multiple hosts + } else { // This runs on multiple hosts XBT_WARN("HostLoad plugin currently does not support executions on several hosts"); } }); - simgrid::s4u::Host::on_state_change.connect(&on_host_change); - simgrid::s4u::Host::on_speed_change.connect(&on_host_change); + simgrid::s4u::Host::on_state_change_cb(&on_host_change); + simgrid::s4u::Host::on_speed_change_cb(&on_host_change); } /** @brief Returns the current load of that host, as a ratio = achieved_flops / (core_current_speed * core_amount)