Revert 'Delete the temporary route table for model Full' by Pierre since it broke...

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 51eeb16..2b04d72 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -2507,32 +2507,37 @@ static void generic_set_route(routing_component_t rc, const char *src,
               "Invalid count of links, must be greater than zero (%s,%s)",
               src, dst);
 
-  if( compare_routes(route,xbt_dict_get_or_null(_parse_routes, route_name)) )
-         xbt_die(bprintf("The route between \"%s\" and \"%s\" already exist", src,dst));
-
-//  xbt_assert2(!xbt_dict_get_or_null(_parse_routes, route_name),
-//              "The route between \"%s\" and \"%s\" already exist", src,
-//              dst);
-
-  xbt_dict_set(_parse_routes, route_name, route, NULL);
+  route_t route_to_test = xbt_dict_get_or_null(_parse_routes, route_name);
+  if (route_to_test)
+    xbt_assert2(!xbt_dynar_compare(
+         (void*)route->link_list,
+         (void*)route_to_test->link_list,
+         (int_f_cpvoid_cpvoid_t) strcmp),
+       "The route between \"%s\" and \"%s\" already exists", src,dst);
+  else
+    xbt_dict_set(_parse_routes, route_name, route, NULL);
+  
   xbt_free(route_name);
 
-  if(A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES)
-  {
-         int i;
-         route_t route_sym = xbt_new0(s_route_t, 1);
-         route_sym->link_list = xbt_dynar_new(sizeof(char *),NULL);
-         for(i=nb_links ; i>0 ; i--)
-         {
-                char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(route->link_list, i-1, char *)));
-                link_name = bprintf("%s",xbt_dynar_get_as(route->link_list, i-1, char *));
-                xbt_dynar_push_as(route_sym->link_list ,char *, link_name);
-         }
-         DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
-         if( compare_routes(route_sym,xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d",*dst_id, *src_id))) )
-                 xbt_die(bprintf("The route between \"%s\" and \"%s\" already exist", dst,src));
-         xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL);
-   }
+  if (A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES) {
+    int i;
+    route_t route_sym = xbt_new0(s_route_t, 1);
+    route_sym->link_list = xbt_dynar_new(sizeof(char *),NULL);
+    for(i=nb_links ; i>0 ; i--) {
+      char *link_name = xbt_strdup(xbt_dynar_get_as(route->link_list, i-1, char *));
+      xbt_dynar_push_as(route_sym->link_list ,char *, link_name);
+    }
+    DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+    route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d",*dst_id, *src_id));
+    if (route_to_test)
+      xbt_assert2(!xbt_dynar_compare(
+           (void*)route_sym->link_list,
+           (void*)route_to_test->link_list,
+           (int_f_cpvoid_cpvoid_t) strcmp),
+         "The route between \"%s\" and \"%s\" already exists", dst,src);
+    else
+      xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL);
+  }
 }
 
 static void generic_set_ASroute(routing_component_t rc, const char *src,
@@ -2560,37 +2565,45 @@ static void generic_set_ASroute(routing_component_t rc, const char *src,
               "Invalid count of links, must be greater than zero (%s,%s)",
               src, dst);
 
-  if( compare_routes((route_t) &(e_route->generic_route),xbt_dict_get_or_null(_parse_routes, route_name)) )
-  xbt_die(bprintf("The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
-              src, e_route->src_gateway, dst, e_route->dst_gateway));
-
-  xbt_dict_set(_parse_routes, route_name, e_route, NULL);
+  route_t route_to_test = xbt_dict_get_or_null(_parse_routes, route_name);
+  if (route_to_test)
+    xbt_assert4(!xbt_dynar_compare(
+         (void*) (&e_route->generic_route)->link_list,
+         (void*) route_to_test->link_list,
+         (int_f_cpvoid_cpvoid_t) strcmp),
+       "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
+       src, e_route->src_gateway, dst, e_route->dst_gateway);
+  else
+    xbt_dict_set(_parse_routes, route_name, e_route, NULL);
+ 
   xbt_free(route_name);
 
   unsigned long nb_links = xbt_dynar_length(e_route->generic_route.link_list);
-  if(A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES)
-  {
-         int i;
-         route_extended_t route_sym = xbt_new0(s_route_extended_t, 1);
-         route_sym->generic_route.link_list = xbt_dynar_new(sizeof(char *),NULL);
-         for(i=nb_links ; i>0 ; i--)
-         {
-                char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *)));
-                link_name = bprintf("%s",xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *));
-                xbt_dynar_push_as(route_sym->generic_route.link_list ,char *, link_name);
-         }
-         route_sym->src_gateway = xbt_new0( char,strlen(e_route->dst_gateway) );
-         route_sym->src_gateway = bprintf("%s",e_route->dst_gateway);
-         route_sym->dst_gateway = xbt_new0( char,strlen(e_route->src_gateway) );
-         route_sym->dst_gateway = bprintf("%s",e_route->src_gateway);
-         DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",dst, route_sym->src_gateway,src,route_sym->dst_gateway);
-
-         if( compare_routes((route_t) &(route_sym->generic_route),xbt_dict_get_or_null(_parse_routes,bprintf("%d#%d", *dst_id, *src_id))) )
-         xbt_die(bprintf("The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
-                     dst, route_sym->src_gateway, src, route_sym->dst_gateway));
-
-         xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL);
-   }
+  if (A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES) {
+    int i;
+    route_extended_t route_sym = xbt_new0(s_route_extended_t, 1);
+    route_sym->generic_route.link_list = xbt_dynar_new(sizeof(char *),NULL);
+    for(i=nb_links ; i>0 ; i--) {
+      char *link_name = bprintf("%s",xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *));
+      xbt_dynar_push_as(route_sym->generic_route.link_list ,char *, link_name);
+    }
+    route_sym->src_gateway = xbt_new0( char,strlen(e_route->dst_gateway) );
+    route_sym->src_gateway = bprintf("%s",e_route->dst_gateway);
+    route_sym->dst_gateway = xbt_new0( char,strlen(e_route->src_gateway) );
+    route_sym->dst_gateway = bprintf("%s",e_route->src_gateway);
+    DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",dst, route_sym->src_gateway,src,route_sym->dst_gateway);
+
+    route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d", *dst_id, *src_id));
+    if(route_to_test)
+      xbt_assert4(!xbt_dynar_compare(
+           (void*) (&route_sym->generic_route)->link_list,
+           (void*) route_to_test->link_list,
+           (int_f_cpvoid_cpvoid_t) strcmp),
+         "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
+         dst, route_sym->src_gateway, src, route_sym->dst_gateway);
+    else 
+      xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL);
+  }
 }
 
 static void generic_set_bypassroute(routing_component_t rc,
@@ -3294,26 +3307,3 @@ void routing_store_route(void)
 {
   parse_E_route_store_route();
 }
-
-/*
- * Compare two routes to know if the second route is in the table.
- *  route1 : route to store
- *  route2 : old route in the table
- */
-int compare_routes(route_t route1, route_t route2)
-{
-       if(!route2) return 0;
-       if(xbt_dynar_length(route1->link_list) == xbt_dynar_length(route2->link_list))
-       {
-                 int i;
-                 int nb_links = xbt_dynar_length(route1->link_list);
-                 for(i=0 ; i<nb_links ; i++)
-                 {
-                        char *link_name1 = xbt_dynar_get_as(route1->link_list, i, char *);
-                        char *link_name2 = xbt_dynar_get_as(route2->link_list, i, char *);
-                        if(strcmp(link_name1,link_name2)) return 1;
-                 }
-                 return 0;
-       }
-       return 1;
-}