From: navarro <navarro@caraja.(none)>
Date: Mon, 12 Mar 2012 11:56:12 +0000 (+0100)
Subject: Fix call to routing_model_create.
X-Git-Tag: v3_7~311^2~2
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fd8fcb629a452c9da20262476b50e25b7cfbf0ed

Fix call to routing_model_create.
---

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index d6ff8522cf..7e5dcd1613 100644
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -442,7 +442,7 @@ static void surf_network_model_init_internal(void)
     xbt_die("Impossible to initialize GTNetS interface");
   }
 
-  routing_model_create(sizeof(network_link_GTNETS_t), NULL, NULL);
+  routing_model_create(sizeof(network_link_GTNETS_t), NULL);
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c
index 52d4926efa..48a321a647 100644
--- a/src/surf/surf_routing_dijkstra.c
+++ b/src/surf/surf_routing_dijkstra.c
@@ -453,7 +453,7 @@ void model_dijkstra_both_end(AS_t as)
   THIS_AS->route_cache = xbt_dict_new_homogeneous(&route_cache_elem_free);
 
   /* Add the loopback if needed */
-  if (as->hierarchy == SURF_ROUTING_BASE)
+  if (global_routing->loopback && as->hierarchy == SURF_ROUTING_BASE)
     add_loopback_dijkstra(THIS_AS);
 
   /* initialize graph indexes in nodes after graph has been built */