-/* Copyright (c) 2019-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2019-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/s4u/Comm.hpp>
#include <simgrid/s4u/Host.hpp>
-#include "src/kernel/resource/WifiLinkImpl.hpp"
-#include "src/surf/surf_interface.hpp"
#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/resource/WifiLinkImpl.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
/************
* Resource *
************/
+static void update_bw_comm_start(const s4u::Comm& comm)
+{
+ auto* pimpl = static_cast<activity::CommImpl*>(comm.get_impl());
+
+ auto const* actionWifi = dynamic_cast<const kernel::resource::WifiLinkAction*>(pimpl->model_action_);
+ if (actionWifi == nullptr)
+ return;
+
+ if (auto* link_src = actionWifi->get_src_link()) {
+ link_src->inc_active_flux();
+ }
+ if (auto* link_dst = actionWifi->get_dst_link()) {
+ link_dst->inc_active_flux();
+ }
+}
WifiLinkImpl::WifiLinkImpl(const std::string& name, const std::vector<double>& bandwidths, lmm::System* system)
: StandardLinkImpl(name)
this->set_constraint(system->constraint_new(this, 1));
for (auto bandwidth : bandwidths)
bandwidths_.push_back({bandwidth, 1.0, nullptr});
- kernel::activity::CommImpl::on_start.connect(&update_bw_comm_start);
+ s4u::Comm::on_start_cb(&update_bw_comm_start);
s4u::Link::on_communication_state_change_cb(&update_bw_comm_end);
}
return host_rates_.size();
}
-double WifiLinkImpl::wifi_link_dynamic_sharing(WifiLinkImpl* link, double capacity, int n)
+double WifiLinkImpl::wifi_link_dynamic_sharing(const WifiLinkImpl& link, double /*capacity*/, int /*n*/)
{
- double ratio = link->get_max_ratio(n);
- XBT_DEBUG("New ratio value concurrency %d: %lf of link capacity on link %s", n, ratio, link->get_name().c_str());
+ double ratio = link.get_max_ratio();
+ XBT_DEBUG("New ratio value concurrency %d: %lf of link capacity on link %s", link.nb_active_flux_, ratio, link.get_name().c_str());
return ratio;
}
nb_active_flux_--;
}
-void WifiLinkImpl::update_bw_comm_start(const kernel::activity::CommImpl& comm)
-{
- auto* action = static_cast<kernel::resource::NetworkAction*>(comm.surf_action_);
-
- auto const* actionWifi = dynamic_cast<const simgrid::kernel::resource::WifiLinkAction*>(action);
- if (actionWifi == nullptr)
- return;
-
- auto* link_src = actionWifi->get_src_link();
- auto* link_dst = actionWifi->get_dst_link();
- if (link_src != nullptr) {
- link_src->inc_active_flux();
- }
- if (link_dst != nullptr) {
- link_dst->inc_active_flux();
- }
-}
-
-void WifiLinkImpl::update_bw_comm_end(simgrid::kernel::resource::NetworkAction& action, simgrid::kernel::resource::Action::State state)
+void WifiLinkImpl::update_bw_comm_end(const simgrid::kernel::resource::NetworkAction& action,
+ simgrid::kernel::resource::Action::State /*state*/)
{
if (action.get_state() != kernel::resource::Action::State::FINISHED)
return;
}
}
-double WifiLinkImpl::get_max_ratio(int nb_active_flux) const
+double WifiLinkImpl::get_max_ratio() const
{
- double new_peak = -1;
+ double new_peak;
if (nb_active_flux_ > conc_lim_) {
new_peak = (nb_active_flux_-conc_lim_) * co_acc_ + x0_;
XBT_DEBUG("Wi-Fi link peak=(%d-%d)*%lf+%lf=%lf", nb_active_flux_, conc_lim_, co_acc_, x0_, new_peak);
if (not use_callback_) {
XBT_DEBUG("Activate throughput reduction mechanism");
use_callback_ = true;
- this->set_sharing_policy(simgrid::s4u::Link::SharingPolicy::WIFI,
- std::bind(&wifi_link_dynamic_sharing, this, std::placeholders::_1, std::placeholders::_2));
+ this->set_sharing_policy(
+ simgrid::s4u::Link::SharingPolicy::WIFI,
+ std::bind(&wifi_link_dynamic_sharing, std::cref(*this), std::placeholders::_1, std::placeholders::_2));
}
return use_callback_;
}