X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bc85164acb335cf909052b966b2ee4932e06cd7..697e7bf5e65bce115783c6debcded0cf6f14744d:/src/surf/network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 1c1241dbca..3265a9919c 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-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. */
@@ -14,7 +14,7 @@
 #include <algorithm>
 #include <numeric>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_network);
 
 double sg_latency_factor = 1.0; /* default value; can be set by model or from command line */
 double sg_bandwidth_factor = 1.0;       /* default value; can be set by model or from command line */
@@ -71,7 +71,7 @@ namespace simgrid {
 namespace kernel {
 namespace resource {
 
-NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
+NetworkCm02Model::NetworkCm02Model()
     : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
                                                                                       : Model::UpdateAlgo::LAZY)
 {
@@ -86,7 +86,7 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b
     select = true;
   }
 
-  set_maxmin_system(make_new_lmm_system(select));
+  set_maxmin_system(new lmm::System(select));
   loopback_ = NetworkCm02Model::create_link("__loopback__", 
                                             std::vector<double>{simgrid::config::get_value<double>("network/loopback-bw")},
                                             simgrid::config::get_value<double>("network/loopback-lat"),
@@ -130,7 +130,7 @@ void NetworkCm02Model::update_actions_state_lazy(double now, double /*delta*/)
 void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta)
 {
   for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
-    NetworkCm02Action& action = static_cast<NetworkCm02Action&>(*it);
+    auto& action = static_cast<NetworkCm02Action&>(*it);
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
     XBT_DEBUG("Something happened to action %p", &action);
     double deltap = delta;
@@ -188,20 +188,27 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
 
   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));
+  if (not route.empty() && route.front()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+    src_wifi_link = static_cast<NetworkWifiLink*>(route.front());
     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));
+  if (route.size() > 1 && route.back()->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
+    dst_wifi_link = static_cast<NetworkWifiLink*>(route.back());
     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());
   }
+  if (route.size() > 2)
+    for (unsigned i = 1; i < route.size() - 1; i++)
+      xbt_assert(route[i]->get_sharing_policy() != s4u::Link::SharingPolicy::WIFI,
+                 "Link '%s' is a WIFI link. It can only be at the beginning or the end of the route from '%s' to '%s', "
+                 "not in between (it is at position %u out of %zu). "
+                 "Did you declare an access_point in your WIFI zones?",
+                 route[i]->get_cname(), src->get_cname(), dst->get_cname(), i + 1, route.size());
 
   NetworkCm02Action* action;
   if (src_wifi_link == nullptr && dst_wifi_link == nullptr)
@@ -266,7 +273,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
     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) {
+  for (auto const* link : route) {
     // WIFI links are handled manually just above, so skip them now
     if (link->get_sharing_policy() == s4u::Link::SharingPolicy::WIFI) {
       xbt_assert(link == src_wifi_link || link == dst_wifi_link,
@@ -285,7 +292,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
     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)
+    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