and now with the right test so that not all our tests fail

[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 3263bb8..3c2c05d 100644 (file)
--- a/src/surf/surf_routing_full.c
+++ b/src/surf/surf_routing_full.c
@@ -8,6 +8,7 @@
 
 /* Global vars */
 extern routing_global_t global_routing;
+extern int surf_parse_lineno;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
 
@@ -156,7 +157,7 @@ void model_full_end(AS_t current_routing)
   }
 }
 
-static int surf_pointer_resource_cmp(const void *a, const void *b) {
+static int full_pointer_resource_cmp(const void *a, const void *b) {
   return a != b;
 }
 
@@ -190,17 +191,37 @@ void model_full_set_route(AS_t rc, const char *src,
                        xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
                        xbt_dynar_push(link_route_to_test,&link);
                }
-               xbt_assert(!xbt_dynar_compare(
-                         (void*)TO_ROUTE_FULL(*src_id, *dst_id)->link_list,
-                         (void*)link_route_to_test,
-                         (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
-                         "The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst);
+               if (xbt_dynar_compare((void*)TO_ROUTE_FULL(*src_id, *dst_id)->link_list,
+                                             (void*)link_route_to_test,
+                                             (int_f_cpvoid_cpvoid_t) full_pointer_resource_cmp)) {
+                       surf_parse_error("A route between \"%s\" and \"%s\" already exists with a different content. "
+                                                "If you are trying to define a reverse route, you must set the symmetrical=no "
+                                                "attribute to your routes tags.", src,dst);
+               } else {
+                       surf_parse_warn("Ignoring the identical redefinition of the route between \"%s\" and \"%s\"",src,dst);
+               }
        }
        else
        {
                  if(!route->dst_gateway && !route->src_gateway)
                          XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
                  else{
+                   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 declared within the current AS, but '%s' is not an AS within '%s'",
+                         src,rc->name);
+                   if (xbt_dict_get_or_null(subas->to_index, route->src_gateway) == NULL)
+                     surf_parse_error("In an ASroute, source gateway must be part of the source sub-AS (in particular, being in a sub-sub-AS is not allowed), but '%s' is not in '%s'.",
+                         route->src_gateway,subas->name);
+
+                   subas = xbt_dict_get_or_null(rc->routing_sons, dst);
+                   if (subas==NULL)
+                     surf_parse_error("The destination of an ASroute must be a sub-AS declared within the current AS, but '%s' is not an AS within '%s'",
+                         dst,rc->name);
+                   if (xbt_dict_get_or_null(subas->to_index, route->dst_gateway) == NULL)
+                     surf_parse_error("In an ASroute, destination gateway must be part of the destination sub-AS (in particular, in a sub-sub-AS is not allowed), but '%s' is not in '%s'.",
+                         route->dst_gateway,subas->name);
+
                          XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
                                 route->src_gateway, dst, route->dst_gateway);
                          if(routing_get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
@@ -237,7 +258,7 @@ void model_full_set_route(AS_t rc, const char *src,
                        xbt_assert(!xbt_dynar_compare(
                                  (void*)TO_ROUTE_FULL(*dst_id, *src_id)->link_list,
                              (void*)link_route_to_test,
-                                 (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+                                 (int_f_cpvoid_cpvoid_t) full_pointer_resource_cmp),
                                  "The route between \"%s\" and \"%s\" already exists", src,dst);
                }
                else