X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec4e2d87d99b8ad76c9096033eb858e9052b09fa..5f9b13c6302e914a514168da8ff54818c0ee6787:/src/surf/surf_routing_floyd.cpp

diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp
index 1c20aebdc2..7f2c653bb8 100644
--- a/src/surf/surf_routing_floyd.cpp
+++ b/src/surf/surf_routing_floyd.cpp
@@ -4,8 +4,9 @@
 /* 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 "surf_routing_floyd.hpp"
-#include "network_interface.hpp"
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_floyd.hpp"
+#include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
 
@@ -37,12 +38,12 @@ AsFloyd::~AsFloyd(){
   int table_size;
   table_size = (int)xbt_dynar_length(p_indexNetworkElm);
   if (p_linkTable == NULL) // Dealing with a parse error in the file?
-	  return;
+    return;
   /* Delete link_table */
   for (i = 0; i < table_size; i++)
-	  for (j = 0; j < table_size; j++) {
-		  generic_free_route(TO_FLOYD_LINK(i, j));
-	  }
+    for (j = 0; j < table_size; j++) {
+      generic_free_route(TO_FLOYD_LINK(i, j));
+    }
   xbt_free(p_linkTable);
   /* Delete bypass dict */
   xbt_dict_free(&p_bypassRoutes);
@@ -119,7 +120,7 @@ void AsFloyd::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbar
 
     if (p_hierarchy == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL
         && strcmp(prev_dst_gw->getName(), e_route->gw_src->getName())) {
-      routing_get_route_and_latency(prev_dst_gw, e_route->gw_src,
+      routing_platf->getRouteAndLatency(prev_dst_gw, e_route->gw_src,
                                     &res->link_list, lat);
     }
 
@@ -154,8 +155,8 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
   int table_size = (int)xbt_dynar_length(p_indexNetworkElm);
   NetCard *src_net_elm, *dst_net_elm;
 
-  src_net_elm = sg_routing_edge_by_name_or_null(src);
-  dst_net_elm = sg_routing_edge_by_name_or_null(dst);
+  src_net_elm = sg_netcard_by_name_or_null(src);
+  dst_net_elm = sg_netcard_by_name_or_null(dst);
 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);
@@ -259,7 +260,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route)
             route->gw_src->getName(), src, route->gw_dst->getName());
 
       TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()) =
-    		 newExtendedRoute(p_hierarchy, route, 0);
+         newExtendedRoute(p_hierarchy, route, 0);
       TO_FLOYD_PRED(dst_net_elm->getId(), src_net_elm->getId()) = dst_net_elm->getId();
       TO_FLOYD_COST(dst_net_elm->getId(), src_net_elm->getId()) =
           ((TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()))->link_list)->used;   /* count of links, old model assume 1 */