move NetCard to its own header file

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

diff --git a/src/kernel/routing/AsClusterTorus.cpp b/src/kernel/routing/AsClusterTorus.cpp
index a65bbad..8690cdc 100644 (file)
--- a/src/kernel/routing/AsClusterTorus.cpp
+++ b/src/kernel/routing/AsClusterTorus.cpp
@@ -4,6 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/routing/AsClusterTorus.hpp"
+#include "src/kernel/routing/NetCard.hpp"
+
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
 
@@ -109,15 +111,16 @@ namespace simgrid {
       xbt_dynar_free(&dimensions);
     }
 
-    void AsClusterTorus::getRouteAndLatency(NetCard * src, NetCard * dst, sg_platf_route_cbarg_t route, double *lat) {
+    void AsClusterTorus::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
+    {
 
-      XBT_VERB("torus_get_route_and_latency from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(),
-               dst->name().c_str(), dst->id());
+      XBT_VERB("torus getLocalRoute from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(), dst->name().c_str(),
+               dst->id());
 
       if (dst->isRouter() || src->isRouter())
         return;
 
-      if ((src->id() == dst->id()) && hasLoopback_) {
+      if (src->id() == dst->id() && hasLoopback_) {
         s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id() * linkCountPerNode_);
 
         route->link_list->push_back(info.linkUp);
@@ -140,9 +143,8 @@ namespace simgrid {
        * both arrays, we can easily assess whether we need to route
        * into this dimension or not.
        */
-      unsigned int *myCoords, *targetCoords;
-      myCoords = rankId_to_coords(src->id(), dimensions_);
-      targetCoords = rankId_to_coords(dst->id(), dimensions_);
+      unsigned int* myCoords     = rankId_to_coords(src->id(), dimensions_);
+      unsigned int* targetCoords = rankId_to_coords(dst->id(), dimensions_);
       /*
        * linkOffset describes the offset where the link
        * we want to use is stored