From: navarro <navarro@caraja.(none)>
Date: Tue, 21 Feb 2012 11:28:41 +0000 (+0100)
Subject: Add a variable to see if having set a bypass route or not.
X-Git-Tag: exp_20120308~38^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/59f29c7c6a9e5518c9d1faf8b3e1333b2a5bfcd1

Add a variable to see if having set a bypass route or not.
---

diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c
index bfb16f9862..55be68eca0 100644
--- a/src/surf/surf_routing_generic.c
+++ b/src/surf/surf_routing_generic.c
@@ -14,6 +14,8 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
 
+static int having_set_bypassroute = 0;
+
 AS_t model_generic_create_sized(size_t childsize) {
   AS_t new_component = model_none_create_sized(childsize);
 
@@ -81,6 +83,7 @@ void generic_parse_bypassroute(AS_t rc,
   xbt_free(e_route);
 
   xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, NULL);
+  having_set_bypassroute = 1;
   xbt_free(route_name);
 }
 
@@ -94,6 +97,10 @@ xbt_dynar_t generic_get_onelink_routes(AS_t rc) { // FIXME: kill that stub
 
 route_t generic_get_bypassroute(AS_t rc, const char *src, const char *dst)
 {
+  // If never set a bypass route return NULL
+  if(!having_set_bypassroute)
+    return NULL;
+
   xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
   AS_t src_as, dst_as;
   int index_src, index_dst;