X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e07254f3777d8ecca2276e9ce60e3ae4473f47e..3a76359d818d1d9c0b3dad7d552e5b32b4595335:/src/surf/network_wifi.cpp

diff --git a/src/surf/network_wifi.cpp b/src/surf/network_wifi.cpp
index 6d90be5044..a39a7ca3fa 100644
--- a/src/surf/network_wifi.cpp
+++ b/src/surf/network_wifi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-2021. 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. */
@@ -7,7 +7,7 @@
 #include "simgrid/s4u/Host.hpp"
 #include "src/surf/surf_interface.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 
 namespace simgrid {
 namespace kernel {
@@ -17,30 +17,27 @@ namespace resource {
  * Resource *
  ************/
 
-NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                                 lmm::System* system)
-    : LinkImpl(model, name, system->constraint_new(this, 1))
+NetworkWifiLink::NetworkWifiLink(const std::string& name, std::vector<double> bandwidths, lmm::System* system)
+    : LinkImpl(name)
 {
+  this->set_constraint(system->constraint_new(this, 1));
   for (auto bandwidth : bandwidths)
     bandwidths_.push_back({bandwidth, 1.0, nullptr});
-
-  simgrid::s4u::Link::on_creation(*get_iface());
 }
 
 void NetworkWifiLink::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 (insert_done.second == false)
+  if (not insert_done.second)
     insert_done.first->second = rate_level;
 
   // Each time we add a host, we refresh the decay model
   refresh_decay_bandwidths();
 }
 
-double NetworkWifiLink::get_host_rate(const s4u::Host* host)
+double NetworkWifiLink::get_host_rate(const s4u::Host* host) const
 {
-  std::map<xbt::string, int>::iterator host_rates_it;
-  host_rates_it = host_rates_.find(host->get_name());
+  auto host_rates_it = host_rates_.find(host->get_name());
 
   if (host_rates_it == host_rates_.end())
     return -1;
@@ -57,17 +54,22 @@ double NetworkWifiLink::get_host_rate(const s4u::Host* host)
   return rate.peak * rate.scale;
 }
 
-s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy()
+s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy() const
 {
   return s4u::Link::SharingPolicy::WIFI;
 }
 
+int NetworkWifiLink::get_host_count() const
+{
+  return static_cast<int>(host_rates_.size());
+}
+
 void NetworkWifiLink::refresh_decay_bandwidths(){
   // Compute number of STAtion on the Access Point
-  int nSTA=host_rates_.size();
-    
+  int nSTA = get_host_count();
+
   std::vector<Metric> new_bandwidths;
-  for (auto bandwidth : bandwidths_){
+  for (auto const& bandwidth : bandwidths_) {
     // Instantiate decay model relatively to the actual bandwidth
     double max_bw=bandwidth.peak;
     double min_bw=bandwidth.peak-(wifi_max_rate_-wifi_min_rate_);