used unsigned long long to have more than 50 bits

[simgrid.git] / src / kernel / routing / TorusZone.cpp

diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp
index 4c38ff8..b2c1896 100644 (file)
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@ -4,8 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/routing/TorusZone.hpp"
-#include "src/kernel/routing/NetCard.hpp"
-
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf");
@@ -61,17 +60,17 @@ void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
     link.latency   = cluster->lat;
     link.policy    = cluster->sharing_policy;
     sg_platf_new_link(&link);
-    Link* linkUp;
-    Link* linkDown;
+    surf::LinkImpl* linkUp;
+    surf::LinkImpl* linkDown;
     if (link.policy == SURF_LINK_FULLDUPLEX) {
       char* tmp_link = bprintf("%s_UP", link_id);
-      linkUp         = Link::byName(tmp_link);
+      linkUp         = surf::LinkImpl::byName(tmp_link);
       free(tmp_link);
       tmp_link = bprintf("%s_DOWN", link_id);
-      linkDown = Link::byName(tmp_link);
+      linkDown = surf::LinkImpl::byName(tmp_link);
       free(tmp_link);
     } else {
-      linkUp   = Link::byName(link_id);
+      linkUp   = surf::LinkImpl::byName(link_id);
       linkDown = linkUp;
     }
     /*
@@ -110,7 +109,7 @@ void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
   xbt_dynar_free(&dimensions);
 }
 
-void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
+void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
 {
 
   XBT_VERB("torus getLocalRoute from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(), dst->name().c_str(),
@@ -120,7 +119,7 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t
     return;
 
   if (src->id() == dst->id() && hasLoopback_) {
-    std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_);
+    std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_);
 
     route->link_list->push_back(info.first);
     if (lat)
@@ -200,7 +199,7 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t
       dim_product *= cur_dim;
     }
 
-    std::pair<Link*, Link*> info;
+    std::pair<surf::LinkImpl*, surf::LinkImpl*> info;
 
     if (hasLimiter_) { // limiter for sender
       info = privateLinks_.at(nodeOffset + hasLoopback_);
@@ -223,8 +222,6 @@ void TorusZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t
   }
   free(myCoords);
   free(targetCoords);
-
-  return;
 }
 }
 }