X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa1e6cc790aa637bae2c2fd03e3cf2c5365ae478..c967cf616fe1b1eb28db36f9b1e823b5f6e6e8b9:/src/surf/network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 9f69a5101e..a6b00b46f9 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -186,7 +186,28 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
           std::any_of(back_route.begin(), back_route.end(), [](const LinkImpl* link) { return not link->is_on(); });
   }
 
-  auto* action              = new NetworkCm02Action(this, *src, *dst, size, failed);
+  NetworkWifiLink* src_wifi_link = nullptr;
+  NetworkWifiLink* dst_wifi_link = nullptr;
+  if (not route.empty() && route.at(0)->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+    src_wifi_link = static_cast<NetworkWifiLink*>(route.at(0));
+    xbt_assert(src_wifi_link->get_host_rate(src) != -1,
+               "The route from %s to %s begins with the WIFI link %s, but the host %s does not seem attached to that "
+               "WIFI link. Did you call link->set_host_rate()?",
+               src->get_cname(), dst->get_cname(), src_wifi_link->get_cname(), src->get_cname());
+  }
+  if (route.size() > 1 && route.at(route.size() - 1)->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+    dst_wifi_link = static_cast<NetworkWifiLink*>(route.at(route.size() - 1));
+    xbt_assert(dst_wifi_link->get_host_rate(dst) != -1,
+               "The route from %s to %s ends with the WIFI link %s, but the host %s does not seem attached to that "
+               "WIFI link. Did you call link->set_host_rate()?",
+               src->get_cname(), dst->get_cname(), dst_wifi_link->get_cname(), dst->get_cname());
+  }
+
+  NetworkCm02Action* action;
+  if (src_wifi_link == nullptr && dst_wifi_link == nullptr)
+    action = new NetworkCm02Action(this, *src, *dst, size, failed);
+  else
+    action = new NetworkWifiAction(this, *src, *dst, size, failed, src_wifi_link, dst_wifi_link);
   action->sharing_penalty_  = latency;
   action->latency_ = latency;
   action->rate_ = rate;
@@ -238,20 +259,19 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
                                     : action->rate_);
   }
 
+  if (src_wifi_link != nullptr)
+    get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(),
+                                1.0 / src_wifi_link->get_host_rate(src));
+  if (dst_wifi_link != nullptr)
+    get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(),
+                                1.0 / dst_wifi_link->get_host_rate(dst));
+
   for (auto const& link : route) {
-    // Handle WIFI links
+    // WIFI links are handled manually just above, so skip them now
     if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
-      NetworkWifiLink* wifi_link = static_cast<NetworkWifiLink*>(link);
-
-      double wifi_rate = wifi_link->get_host_rate(src);
-      if (wifi_rate == -1.0)
-        wifi_rate = wifi_link->get_host_rate(dst);
-      xbt_assert(wifi_rate != -1.0,
-                 "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 / wifi_rate);
-
+      xbt_assert(link == src_wifi_link || link == dst_wifi_link,
+                 "Wifi links can only occure at the beginning of the route (meaning that it's attached to the src) or "
+                 "at its end (meaning that it's attached to the dst");
     } else {
       get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), 1.0);
     }
@@ -259,35 +279,22 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
 
   if (cfg_crosstraffic) {
     XBT_DEBUG("Crosstraffic active: adding backward flow using 5%% of the available bandwidth");
-    bool wifi_dst_assigned = false; // Used by wifi crosstraffic
-    for (auto const& link : back_route) {
-      if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
-        NetworkWifiLink* wifi_link = static_cast<NetworkWifiLink*>(link);
-        /**
-         * For wifi links we should add 0.05/rate.
-         * However since we are using the "back_route" we should encounter in
-         * the first place the dst wifi link.
-         */
-        if (!wifi_dst_assigned && (wifi_link->get_host_rate(dst) != -1)) {
-          get_maxmin_system()->expand(link->get_constraint(), action->get_variable(),
-                                      .05 / wifi_link->get_host_rate(dst));
-          wifi_dst_assigned = true;
-        } else {
-          get_maxmin_system()->expand(link->get_constraint(), action->get_variable(),
-                                      .05 / wifi_link->get_host_rate(src));
-        }
-      } else {
+    if (dst_wifi_link != nullptr)
+      get_maxmin_system()->expand(dst_wifi_link->get_constraint(), action->get_variable(),
+                                  .05 / dst_wifi_link->get_host_rate(dst));
+    if (src_wifi_link != nullptr)
+      get_maxmin_system()->expand(src_wifi_link->get_constraint(), action->get_variable(),
+                                  .05 / src_wifi_link->get_host_rate(src));
+    for (auto const& link : back_route)
+      if (link->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI)
         get_maxmin_system()->expand(link->get_constraint(), action->get_variable(), .05);
-      }
-    }
-
     // Change concurrency_share here, if you want that cross-traffic is included in the SURF concurrency
     // (You would also have to change simgrid::kernel::lmm::Element::get_concurrency())
     // action->getVariable()->set_concurrency_share(2)
   }
   XBT_OUT();
 
-  simgrid::s4u::Link::on_communicate(*action, src, dst);
+  simgrid::s4u::Link::on_communicate(*action);
   return action;
 }