More condensed debug...

[simgrid.git] / src / surf / surf_routing_full.c

diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c
index 776d2ed..25a2079 100644 (file)
--- a/src/surf/surf_routing_full.c
+++ b/src/surf/surf_routing_full.c
@@ -7,7 +7,7 @@
 #include "surf_routing_private.h"
 
 /* Global vars */
-extern routing_global_t global_routing;
+extern routing_platf_t routing_platf;
 extern int surf_parse_lineno;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
@@ -136,7 +136,7 @@ void model_full_end(AS_t current_routing)
     routing->routing_table = xbt_new0(route_t, table_size * table_size);
 
   /* Add the loopback if needed */
-  if (global_routing->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) {
+  if (routing_platf->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) {
     for (i = 0; i < table_size; i++) {
       e_route = TO_ROUTE_FULL(i, i);
       if (!e_route) {
@@ -144,7 +144,7 @@ void model_full_end(AS_t current_routing)
         e_route->src_gateway = NULL;
         e_route->dst_gateway = NULL;
         e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
-        xbt_dynar_push(e_route->link_list, &global_routing->loopback);
+        xbt_dynar_push(e_route->link_list, &routing_platf->loopback);
         TO_ROUTE_FULL(i, i) = e_route;
       }
     }
@@ -202,7 +202,7 @@ void model_full_set_route(AS_t rc, const char *src,
     if (!route->dst_gateway && !route->src_gateway)
       XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
     else {
-      // FIXME We can call a gw wich is down the current AS (cf g5k.xml) but not upper.
+      // FIXME We can call a gw which is down the current AS (cf g5k.xml) but not upper.
       //      AS_t subas = xbt_dict_get_or_null(rc->routing_sons, src);
       //      if (subas == NULL)
       //        surf_parse_error("The source of an ASroute must be a sub-AS "