X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67d66b0cf79b9fc02c0450f254584693dbf21d3b..8c6bbb14f44b8daed5ea43d80880c6bf2155118b:/src/plugins/host_load.cpp diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp index f2b14574e1..6479b3a4f3 100644 --- a/src/plugins/host_load.cpp +++ b/src/plugins/host_load.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2023. 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. */ @@ -10,7 +10,7 @@ #include #include "src/kernel/activity/ExecImpl.hpp" -#include "src/surf/surf_interface.hpp" +#include "src/simgrid/module.hpp" // SIMGRID_REGISTER_PLUGIN // 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) @@ -21,21 +21,20 @@ 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, plugin, "Logging specific to the HostLoad plugin"); -namespace simgrid { -namespace plugin { +namespace simgrid::plugin { static const double activity_uninitialized_remaining_cost = -1; @@ -125,18 +124,19 @@ void HostLoad::update() while (iter != end(current_activities)) { auto& activity = iter->first; // Just an alias auto& remaining_cost_after_last_update = iter->second; // Just an alias - auto& action = activity->surf_action_; + auto& action = activity->model_action_; 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); } @@ -189,8 +189,7 @@ void HostLoad::reset() current_flops_ = host_->get_load(); current_speed_ = host_->get_speed(); } -} // namespace plugin -} // namespace simgrid +} // namespace simgrid::plugin using simgrid::plugin::HostLoad; @@ -236,8 +235,7 @@ void sg_host_load_plugin_init() 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()->add_activity(static_cast(activity.get_impl())); @@ -249,14 +247,13 @@ void sg_host_load_plugin_init() XBT_WARN("HostLoad plugin currently does not support executions on several hosts"); } }); - simgrid::s4u::Activity::on_completion_cb([](simgrid::s4u::Activity& activity) { - const auto* exec = dynamic_cast(&activity); + 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) + if (const auto* vm = dynamic_cast(host)) host = vm->get_pm(); xbt_assert(host != nullptr); host->extension()->update();