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

diff --git a/src/surf/network_wifi.cpp b/src/surf/network_wifi.cpp
index eee27596c2..e9eb61d427 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,14 +17,12 @@ 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)
@@ -63,7 +61,7 @@ s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy() const
 
 int NetworkWifiLink::get_host_count() const
 {
-  return host_rates_.size();
+  return static_cast<int>(host_rates_.size());
 }
 
 void NetworkWifiLink::refresh_decay_bandwidths(){
@@ -71,7 +69,7 @@ void NetworkWifiLink::refresh_decay_bandwidths(){
   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_);
@@ -90,10 +88,14 @@ void NetworkWifiLink::refresh_decay_bandwidths(){
 
 bool NetworkWifiLink::toggle_decay_model(){
   use_decay_model_=!use_decay_model_;
-  return(use_decay_model_);
+  return use_decay_model_;
 }
 
-  
+LinkImpl* NetworkWifiLink::set_latency(double value)
+{
+  xbt_assert(value == 0, "Latency cannot be set for WiFi Links.");
+  return this;
+}
 } // namespace resource
 } // namespace kernel
 } // namespace simgrid