-/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-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 "simgrid/host.h"
-#include "simgrid/plugins/load.h"
-#include "simgrid/s4u/Link.hpp"
-#include "src/surf/network_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
+#include <simgrid/plugins/load.h>
+#include <simgrid/s4u/Engine.hpp>
+
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
#include <limits>
- 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*/
+ bool is_tracked_{false}; /*<Whether the link is tracked or not*/
+
+ double cumulated_bytes_{}; /*< Cumulated load since last reset*/
+ double min_bytes_per_second_{}; /*< Minimum instantaneous load observed since last reset*/
+ double max_bytes_per_second_{}; /*< Maximum instantaneous load observed since last reset*/
+ double last_reset_{}; /*< Timestamp of the last reset (init timestamp by default)*/
+ double last_updated_{}; /*< Timestamp of the last energy update event*/
+
public:
- static simgrid::xbt::Extension<simgrid::s4u::Link, LinkLoad> EXTENSION_ID;
+ static xbt::Extension<s4u::Link, LinkLoad> EXTENSION_ID;
- explicit LinkLoad(simgrid::s4u::Link* ptr);
- ~LinkLoad() = default;
+ explicit LinkLoad(s4u::Link* ptr);
void track();
void untrack();
double get_average_bytes();
/// Getter methods.
- bool is_tracked() const;
+ bool is_tracked() const { return is_tracked_; }
double get_cumulated_bytes();
double get_min_bytes_per_second();
double get_max_bytes_per_second();
-
-private:
- s4u::Link* link_{}; /*< The link onto which this data is attached*/
- bool is_tracked_{false}; /*<Whether the link is tracked or not*/
-
- double cumulated_bytes_{}; /*< Cumulated load since last reset*/
- double min_bytes_per_second_{}; /*< Minimum instantaneous load observed since last reset*/
- double max_bytes_per_second_{}; /*< Maximum instantaneous load observed since last reset*/
- double last_reset_{}; /*< Timestamp of the last reset (init timestamp by default)*/
- double last_updated_{}; /*< Timestamp of the last energy update event*/
};
xbt::Extension<s4u::Link, LinkLoad> LinkLoad::EXTENSION_ID;
-LinkLoad::LinkLoad(simgrid::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());
}
void LinkLoad::track()
{
- xbt_assert(!is_tracked_, "Trying to track load of link '%s' while it is already tracked, aborting.",
+ xbt_assert(not is_tracked_, "Trying to track load of link '%s' while it is already tracked, aborting.",
link_->get_cname());
XBT_DEBUG("Tracking load of link '%s'", link_->get_cname());
max_bytes_per_second_ = std::numeric_limits<double>::lowest();
XBT_DEBUG("min_bytes_per_second_ = %g", min_bytes_per_second_);
XBT_DEBUG("max_bytes_per_second_ = %g", max_bytes_per_second_);
- last_reset_ = surf_get_clock();
+ last_reset_ = simgrid::s4u::Engine::get_clock();
last_updated_ = last_reset_;
}
link_->get_cname());
double current_instantaneous_bytes_per_second = link_->get_usage();
- double now = surf_get_clock();
+ double now = simgrid::s4u::Engine::get_clock();
// Update minimum/maximum observed values if needed
min_bytes_per_second_ = std::min(min_bytes_per_second_, current_instantaneous_bytes_per_second);
last_updated_ = now;
}
-bool LinkLoad::is_tracked() const
-{
- return is_tracked_;
-}
double LinkLoad::get_cumulated_bytes()
{
update();
{
update();
- double now = surf_get_clock();
+ double now = simgrid::s4u::Engine::get_clock();
if (now > last_reset_)
return cumulated_bytes_ / (now - last_reset_);
else
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::kernel::activity::CommImpl& 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<LinkLoad>();
- if (link_load->is_tracked()) {
- link_load->update();
+ for (const auto* link : comm.get_traversed_links()) {
+ if (link != nullptr && link->get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) {
+ auto* link_load = link->extension<LinkLoad>();
+ XBT_DEBUG("Update %s on Comm Start/End", link->get_cname());
+ if (link_load->is_tracked())
+ link_load->update();
}
}
}
*/
void sg_link_load_plugin_init()
{
- xbt_assert(sg_host_count() == 0, "Please call sg_link_load_plugin_init() BEFORE initializing the platform.");
- xbt_assert(!LinkLoad::EXTENSION_ID.valid(), "Double call to sg_link_load_plugin_init. Aborting.");
+ 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<LinkLoad>();
// 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));
});
// 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::kernel::activity::CommImpl::on_start.connect(&on_communication);
+ simgrid::kernel::activity::CommImpl::on_completion.connect(&on_communication);
+
+ simgrid::s4u::Link::on_state_change_cb([](simgrid::s4u::Link const& link) {
if (link.get_sharing_policy() != simgrid::s4u::Link::SharingPolicy::WIFI) {
auto link_load = link.extension<LinkLoad>();
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<LinkLoad>();
- 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<LinkLoad>();
+ if (link_load->is_tracked())
+ link_load->update();
+ }
+ }
+ });
}
/**
