X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f5cc4e090af49a98da0e25e9ee21a8ce6ce30f8..f16ce13525c4b4e00ef8e1f578dc92794fa10506:/src/plugins/link_load.cpp diff --git a/src/plugins/link_load.cpp b/src/plugins/link_load.cpp index 6936082b52..d2df784b32 100644 --- a/src/plugins/link_load.cpp +++ b/src/plugins/link_load.cpp @@ -1,13 +1,15 @@ -/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-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. */ -#include "simgrid/plugins/load.h" -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Link.hpp" -#include "src/surf/network_interface.hpp" -#include "src/surf/surf_interface.hpp" +#include +#include +#include + +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/resource/NetworkModel.hpp" +#include "src/simgrid/module.hpp" // SIMGRID_REGISTER_PLUGIN #include @@ -32,10 +34,9 @@ SIMGRID_REGISTER_PLUGIN(link_load, "Link cumulated load.", &sg_link_load_plugin_ - Reset the counters on any tracked link via sg_link_load_reset(). */ -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(link_load, surf, "Logging specific to the SURF LinkLoad plugin"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(link_load, kernel, "Logging specific to the LinkLoad plugin"); -namespace simgrid { -namespace plugin { +namespace simgrid::plugin { class LinkLoad { s4u::Link* link_{}; /*< The link onto which this data is attached*/ @@ -67,7 +68,7 @@ public: xbt::Extension LinkLoad::EXTENSION_ID; -LinkLoad::LinkLoad(s4u::Link* ptr) : link_(ptr), is_tracked_(false) +LinkLoad::LinkLoad(s4u::Link* ptr) : link_(ptr) { XBT_DEBUG("Instantiating a LinkLoad for link '%s'", link_->get_cname()); } @@ -111,7 +112,7 @@ void LinkLoad::update() " Please track your link with sg_link_load_track before trying to access any of its load metrics.", link_->get_cname()); - double current_instantaneous_bytes_per_second = link_->get_usage(); + double current_instantaneous_bytes_per_second = link_->get_load(); double now = simgrid::s4u::Engine::get_clock(); // Update minimum/maximum observed values if needed @@ -156,22 +157,20 @@ double LinkLoad::get_average_bytes() return 0; } -} // namespace plugin -} // namespace simgrid +} // namespace simgrid::plugin using simgrid::plugin::LinkLoad; /* **************************** events callback *************************** */ -static void on_communicate(const simgrid::kernel::resource::NetworkAction& action) +static void on_communication(const simgrid::s4u::Comm& comm) { - XBT_DEBUG("on_communicate is called"); - for (auto* link : action.get_links()) { - if (link == nullptr || link->get_sharing_policy() == simgrid::s4u::Link::SharingPolicy::WIFI) - continue; - - auto link_load = link->get_iface()->extension(); - if (link_load->is_tracked()) { - link_load->update(); + const auto* pimpl = static_cast(comm.get_impl()); + for (auto const* link : pimpl->get_traversed_links()) { + if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) { + auto* link_load = link->extension(); + XBT_DEBUG("Update %s on Comm Start/End", link->get_cname()); + if (link_load->is_tracked()) + link_load->update(); } } } @@ -185,13 +184,14 @@ static void on_communicate(const simgrid::kernel::resource::NetworkAction& actio */ void sg_link_load_plugin_init() { - xbt_assert(simgrid::s4u::Engine::get_instance()->get_host_count() == 0, + xbt_assert(simgrid::s4u::Engine::get_instance()->get_host_count() == 0 && + simgrid::s4u::Engine::get_instance()->get_link_count() == 0, "Please call sg_link_load_plugin_init() BEFORE initializing the platform."); xbt_assert(not LinkLoad::EXTENSION_ID.valid(), "Double call to sg_link_load_plugin_init. Aborting."); LinkLoad::EXTENSION_ID = simgrid::s4u::Link::extension_create(); // Attach new LinkLoad links created in the future. - simgrid::s4u::Link::on_creation.connect([](simgrid::s4u::Link& link) { + simgrid::s4u::Link::on_creation_cb([](simgrid::s4u::Link& link) { if (link.get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) { XBT_DEBUG("Wired link '%s' created. Attaching a LinkLoad to it.", link.get_cname()); link.extension_set(new LinkLoad(&link)); @@ -201,25 +201,26 @@ void sg_link_load_plugin_init() }); // Call this plugin on some of the links' events. - simgrid::s4u::Link::on_communicate.connect(&on_communicate); - simgrid::s4u::Link::on_state_change.connect([](simgrid::s4u::Link const& link) { + simgrid::s4u::Comm::on_start_cb(&on_communication); + simgrid::s4u::Comm::on_completion_cb(&on_communication); + + simgrid::s4u::Link::on_onoff_cb([](simgrid::s4u::Link const& link) { if (link.get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) { - auto link_load = link.extension(); + auto* link_load = link.extension(); if (link_load->is_tracked()) link_load->update(); } }); - simgrid::s4u::Link::on_communication_state_change.connect( - [](simgrid::kernel::resource::NetworkAction const& action, - simgrid::kernel::resource::Action::State /* previous */) { - for (auto const* link : action.get_links()) { - if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) { - auto link_load = link->get_iface()->extension(); - if (link_load->is_tracked()) - link_load->update(); - } - } - }); + simgrid::s4u::Link::on_communication_state_change_cb([](simgrid::kernel::resource::NetworkAction const& action, + simgrid::kernel::resource::Action::State /* previous */) { + for (auto const* link : action.get_links()) { + if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) { + auto* link_load = link->get_iface()->extension(); + if (link_load->is_tracked()) + link_load->update(); + } + } + }); } /**