Update copyright lines for 2023.

[simgrid.git] / src / kernel / resource / WifiLinkImpl.cpp

diff --git a/src/kernel/resource/WifiLinkImpl.cpp b/src/kernel/resource/WifiLinkImpl.cpp
index c4fbc12..52e5222 100644 (file)
--- a/src/kernel/resource/WifiLinkImpl.cpp
+++ b/src/kernel/resource/WifiLinkImpl.cpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -9,7 +9,6 @@
 #include "src/surf/surf_interface.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 
-
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 
 namespace simgrid::kernel::resource {
@@ -24,18 +23,13 @@ WifiLinkImpl::WifiLinkImpl(const std::string& name, const std::vector<double>& b
   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::Link::on_communication_state_change_cb(&update_bw_comm_end);
-
-
 }
 
 void WifiLinkImpl::set_host_rate(const s4u::Host* host, int rate_level)
 {
-  auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level));
-  if (not insert_done.second)
-    insert_done.first->second = rate_level;
+  host_rates_[host->get_name()] = rate_level;
 }
 
 double WifiLinkImpl::get_host_rate(const s4u::Host* host) const
@@ -67,83 +61,81 @@ size_t WifiLinkImpl::get_host_count() const
   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;
 }
 
-void WifiLinkImpl::inc_active_flux() {
-  xbt_assert(nb_active_flux_>=0, "Negative nb_active_flux should not exist");
+void WifiLinkImpl::inc_active_flux()
+{
+  xbt_assert(nb_active_flux_ >= 0, "Negative nb_active_flux should not exist");
   nb_active_flux_++;
 }
 
-void WifiLinkImpl::dec_active_flux() {
-  xbt_assert(nb_active_flux_>0, "Negative nb_active_flux should not exist");
+void WifiLinkImpl::dec_active_flux()
+{
+  xbt_assert(nb_active_flux_ > 0, "Negative nb_active_flux should not exist");
   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);
+  auto const* actionWifi = dynamic_cast<const simgrid::kernel::resource::WifiLinkAction*>(comm.surf_action_);
   if (actionWifi == nullptr)
     return;
 
-  auto* link_src = actionWifi->get_src_link();
-  auto* link_dst = actionWifi->get_dst_link();
-  if(link_src != nullptr) {
+  if (auto* link_src = actionWifi->get_src_link()) {
     link_src->inc_active_flux();
   }
-  if(link_dst != nullptr) {
+  if (auto* link_dst = actionWifi->get_dst_link()) {
     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)
+  if (action.get_state() != kernel::resource::Action::State::FINISHED)
     return;
 
   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) {
+  if (auto* link_src = actionWifi->get_src_link()) {
     link_src->dec_active_flux();
   }
-  if(link_dst != nullptr) {
+  if (auto* link_dst = actionWifi->get_dst_link()) {
     link_dst->dec_active_flux();
   }
 }
 
-double WifiLinkImpl::get_max_ratio(int nb_active_flux)
+double WifiLinkImpl::get_max_ratio() const
 {
-  double new_peak = -1;
-  if(nb_active_flux_ > conc_lim_){
+  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);
-  }else{
+    XBT_DEBUG("Wi-Fi link peak=(%d-%d)*%lf+%lf=%lf", nb_active_flux_, conc_lim_, co_acc_, x0_, new_peak);
+  } else {
     new_peak = x0_;
-    XBT_DEBUG("Wi-Fi link peak=%lf",x0_);
+    XBT_DEBUG("Wi-Fi link peak=%lf", x0_);
   }
   // should be the new maximum bandwidth ratio (comparison between max throughput without concurrency and with it)
-  double propCap = new_peak/x0_;
+  double propCap = new_peak / x0_;
 
   return propCap;
 }
 
 bool WifiLinkImpl::toggle_callback()
 {
-  if(! use_callback_) {
+  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_;
 }