cosmetics in the wifi model

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 708f0d1..4c04ee8 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -95,7 +95,7 @@ LinkImpl* NetworkCm02Model::create_link(const std::string& name, const std::vect
                                         s4u::Link::SharingPolicy policy)
 {
   if (policy == s4u::Link::SharingPolicy::WIFI)
-    return new NetworkWifiLink(this, name, bandwidths, policy, get_maxmin_system());
+    return new NetworkWifiLink(this, name, bandwidths, get_maxmin_system());
 
   xbt_assert(bandwidths.size() == 1, "Non-WIFI links must use only 1 bandwidth.");
   return new NetworkCm02Link(this, name, bandwidths[0], latency, policy, get_maxmin_system());
@@ -242,15 +242,14 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
     if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
       NetworkWifiLink* wifi_link = static_cast<NetworkWifiLink*>(link);
 
-      double src_rate = wifi_link->get_host_rate(src);
-      double dst_rate = wifi_link->get_host_rate(dst);
-      xbt_assert(
-          !(src_rate == -1 && dst_rate == -1),
-          "Some Stations are not associated to any Access Point. Make sure to call set_host_rate on all Stations.");
-      if (src_rate != -1)
-        get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / src_rate);
-      else
-        get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / dst_rate);
+      double rate = wifi_link->get_host_rate(src);
+      if (rate == -1)
+        rate = wifi_link->get_host_rate(dst);
+      xbt_assert(rate != -1,
+                 "None of the source (%s) or destination (%s) is connected to the Access Point '%s'. "
+                 "Please use set_host_rate() on all stations.",
+                 src->get_cname(), dst->get_cname(), link->get_cname());
+      get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0 / rate);
 
     } else {
       get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0);

diff --git a/src/surf/network_wifi.cpp b/src/surf/network_wifi.cpp
index f9ab144..50529b3 100644 (file)
--- a/src/surf/network_wifi.cpp
+++ b/src/surf/network_wifi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019. 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. */
@@ -6,14 +6,7 @@
 #include "network_wifi.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/surf/surf_interface.hpp"
-/*
-#include "simgrid/sg_config.hpp"
-#include "src/kernel/resource/profile/Event.hpp"
-#include "surf/surf.hpp"
 
-#include <algorithm>
-#include <numeric>
-*/
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
 namespace simgrid {
@@ -25,14 +18,14 @@ namespace resource {
  ************/
 
 NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                                 s4u::Link::SharingPolicy policy, lmm::System* system)
-    : NetworkCm02Link(
-          model, name, 1 / sg_bandwidth_factor, 0, policy,
-          system) // Since link use bw*sg_bandwidth_factor we should divise in order to as 1 as bound in the lmm system
+                                 lmm::System* system)
+    : NetworkCm02Link(model, name, 1 / sg_bandwidth_factor, 0, s4u::Link::SharingPolicy::WIFI, system)
+//   : LinkImpl(model, name, system->constraint_new(this, 1))
 {
-  for (auto bandwidth : bandwidths) {
+  for (auto bandwidth : bandwidths)
     bandwidths_.push_back({bandwidth, 1.0, nullptr});
-  }
+
+  //  simgrid::s4u::Link::on_creation(this->piface_);
 }
 
 void NetworkWifiLink::set_host_rate(s4u::Host* host, int rate_level)
@@ -51,8 +44,8 @@ double NetworkWifiLink::get_host_rate(sg_host_t host)
     return -1;
 
   int rate_id = host_rates_it->second;
-  xbt_assert(rate_id >= 0 && rate_id < (int)bandwidths_.size(), "Host \"%s\" has an invalid rate \"%d\"",
-             host->get_name().c_str(), rate_id);
+  xbt_assert(rate_id >= 0 && rate_id < (int)bandwidths_.size(), "Host '%s' has an invalid rate '%d' on wifi link '%s'",
+             host->get_name().c_str(), rate_id, this->get_cname());
 
   Metric rate = bandwidths_[rate_id];
   return rate.peak * rate.scale;

diff --git a/src/surf/network_wifi.hpp b/src/surf/network_wifi.hpp
index 33e672d..a1cd907 100644 (file)
--- a/src/surf/network_wifi.hpp
+++ b/src/surf/network_wifi.hpp
@@ -28,12 +28,16 @@ class NetworkWifiLink : public NetworkCm02Link {
 
 public:
   NetworkWifiLink(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                  s4u::Link::SharingPolicy policy, lmm::System* system);
+                  lmm::System* system);
 
   void set_host_rate(s4u::Host* host, int rate_level);
   /** @brief Get the AP rate associated to the host (or -1 if not associated to the AP) */
   double get_host_rate(s4u::Host* host);
+
   s4u::Link::SharingPolicy get_sharing_policy() override;
+  void apply_event(kernel::profile::Event*, double) override { THROW_UNIMPLEMENTED; }
+  void set_bandwidth(double) override { THROW_UNIMPLEMENTED; }
+  void set_latency(double) override { THROW_UNIMPLEMENTED; }
 };
 
 } // namespace resource