X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f..69aaa26fa5228c31e55086fa166479732a9cd1b7:/src/surf/network_wifi.cpp

diff --git a/src/surf/network_wifi.cpp b/src/surf/network_wifi.cpp
index 11d48d18e6..655941ce0b 100644
--- a/src/surf/network_wifi.cpp
+++ b/src/surf/network_wifi.cpp
@@ -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)
@@ -89,11 +87,15 @@ void NetworkWifiLink::refresh_decay_bandwidths(){
 }
 
 bool NetworkWifiLink::toggle_decay_model(){
-  use_decay_model_=!use_decay_model_;
-  return(use_decay_model_);
+  use_decay_model_ = not 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