X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c139b4e36702f58bd8a75e87cf537959da82dbc9..c7c6662f2627dddac82f15cb8d4f1b42ac23e2b9:/src/kernel/routing/ClusterZone.cpp

diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp
index 5b2f74c471..3bed217682 100644
--- a/src/kernel/routing/ClusterZone.cpp
+++ b/src/kernel/routing/ClusterZone.cpp
@@ -21,7 +21,7 @@ ClusterZone::ClusterZone(NetZone* father, std::string name) : NetZoneImpl(father
 {
 }
 
-void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void ClusterZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
 {
   XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
   xbt_assert(not private_links_.empty(),
@@ -30,7 +30,7 @@ void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs*
   if ((src->id() == dst->id()) && has_loopback_) {
     xbt_assert(not src->is_router(), "Routing from a cluster private router to itself is meaningless");
 
-    std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePosition(src->id()));
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos(src->id()));
     route->link_list.push_back(info.first);
     if (lat)
       *lat += info.first->latency();
@@ -39,11 +39,12 @@ void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs*
 
   if (not src->is_router()) { // No private link for the private router
     if (has_limiter_) {      // limiter for sender
-      std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLoopback(src->id()));
+      std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(node_pos_with_loopback(src->id()));
       route->link_list.push_back(info.first);
     }
 
-    std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLimiter(src->id()));
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
+        private_links_.at(node_pos_with_loopback_limiter(src->id()));
     if (info.first) { // link up
       route->link_list.push_back(info.first);
       if (lat)
@@ -59,14 +60,15 @@ void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs*
 
   if (not dst->is_router()) { // No specific link for router
 
-    std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(nodePositionWithLimiter(dst->id()));
+    std::pair<resource::LinkImpl*, resource::LinkImpl*> info =
+        private_links_.at(node_pos_with_loopback_limiter(dst->id()));
     if (info.second) { // link down
       route->link_list.push_back(info.second);
       if (lat)
         *lat += info.second->latency();
     }
     if (has_limiter_) { // limiter for receiver
-      info = private_links_.at(nodePositionWithLoopback(dst->id()));
+      info = private_links_.at(node_pos_with_loopback(dst->id()));
       route->link_list.push_back(info.first);
     }
   }
@@ -91,7 +93,7 @@ void ClusterZone::get_graph(xbt_graph_t graph, std::map<std::string, xbt_node_t>
     if (not src->is_router()) {
       xbt_node_t previous = new_xbt_graph_node(graph, src->get_cname(), nodes);
 
-      std::pair<surf::LinkImpl*, surf::LinkImpl*> info = private_links_.at(src->id());
+      std::pair<resource::LinkImpl*, resource::LinkImpl*> info = private_links_.at(src->id());
 
       if (info.first) { // link up
         xbt_node_t current = new_xbt_graph_node(graph, info.first->get_cname(), nodes);
@@ -129,13 +131,13 @@ void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in
   link.policy    = cluster->sharing_policy;
   sg_platf_new_link(&link);
 
-  surf::LinkImpl *linkUp;
-  surf::LinkImpl *linkDown;
-  if (link.policy == SURF_LINK_SPLITDUPLEX) {
-    linkUp   = surf::LinkImpl::byName(link_id + "_UP");
-    linkDown = surf::LinkImpl::byName(link_id + "_DOWN");
+  resource::LinkImpl* linkUp;
+  resource::LinkImpl* linkDown;
+  if (link.policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) {
+    linkUp   = resource::LinkImpl::byName(link_id + "_UP");
+    linkDown = resource::LinkImpl::byName(link_id + "_DOWN");
   } else {
-    linkUp   = surf::LinkImpl::byName(link_id);
+    linkUp   = resource::LinkImpl::byName(link_id);
     linkDown = linkUp;
   }
   private_links_.insert({position, {linkUp, linkDown}});