X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e53e94eb6cb9f8edda78234ec8a0ba7880431d2a..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/kernel/routing/VivaldiZone.cpp

diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp
index aa2a15d05a..e9c2ccba9a 100644
--- a/src/kernel/routing/VivaldiZone.cpp
+++ b/src/kernel/routing/VivaldiZone.cpp
@@ -1,22 +1,21 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2023. 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. */
 
-#include "simgrid/kernel/routing/VivaldiZone.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "src/surf/network_interface.hpp"
-#include "surf/surf.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/VivaldiZone.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Host.hpp>
+
+#include "src/kernel/resource/StandardLinkImpl.hpp"
 
 #include <boost/algorithm/string.hpp>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_vivaldi, ker_routing, "Kernel Vivaldi Routing");
 
 namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace kernel::routing {
 
 namespace vivaldi {
 
@@ -64,21 +63,21 @@ void VivaldiZone::set_peer_link(NetPoint* netpoint, double bw_in, double bw_out)
 
   std::string link_up        = "link_" + netpoint->get_name() + "_UP";
   std::string link_down      = "link_" + netpoint->get_name() + "_DOWN";
-  const auto* linkUp         = create_link(link_up, std::vector<double>{bw_out})->seal();
-  const auto* linkDown       = create_link(link_down, std::vector<double>{bw_in})->seal();
-  add_route(netpoint, nullptr, nullptr, nullptr, {linkUp->get_impl()}, false);
-  add_route(nullptr, netpoint, nullptr, nullptr, {linkDown->get_impl()}, false);
+  const auto* linkUp         = create_link(link_up, {bw_out})->seal();
+  const auto* linkDown       = create_link(link_down, {bw_in})->seal();
+  add_route(netpoint, nullptr, nullptr, nullptr, {s4u::LinkInRoute(linkUp)}, false);
+  add_route(nullptr, netpoint, nullptr, nullptr, {s4u::LinkInRoute(linkDown)}, false);
 }
 
 void VivaldiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat)
 {
-  XBT_DEBUG("vivaldi getLocalRoute from '%s'[%u] '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
-
+  XBT_DEBUG("vivaldi getLocalRoute from '%s'[%lu] '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
+  const auto* engine = s4u::Engine::get_instance();
   if (src->is_netzone()) {
     std::string srcName = "router_" + src->get_name();
     std::string dstName = "router_" + dst->get_name();
-    route->gw_src_      = s4u::Engine::get_instance()->netpoint_by_name_or_null(srcName);
-    route->gw_dst_      = s4u::Engine::get_instance()->netpoint_by_name_or_null(dstName);
+    route->gw_src_      = engine->netpoint_by_name_or_null(srcName);
+    route->gw_dst_      = engine->netpoint_by_name_or_null(dstName);
   }
 
   StarZone::get_local_route(src, dst, route, lat);
@@ -96,8 +95,7 @@ void VivaldiZone::get_local_route(const NetPoint* src, const NetPoint* dst, Rout
   }
 }
 
-} // namespace routing
-} // namespace kernel
+} // namespace kernel::routing
 
 namespace s4u {
 NetZone* create_vivaldi_zone(const std::string& name)