Free dynar after use in xbt_dynar_compare.

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 42a3b98..4fb63a4 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1072,7 +1072,8 @@ static e_surf_network_element_type_t get_network_element_type(const char
                                                               *name)
 {
   network_element_info_t rc = NULL;
-  rc = xbt_dict_get(global_routing->where_network_elements, name);
+  rc = xbt_dict_get_or_null(global_routing->where_network_elements, name);
+  if(!rc) return SURF_NETWORK_ELEMENT_NULL;
   return rc->rc_type;
 }
 
@@ -1372,15 +1373,19 @@ static void model_full_set_route(routing_component_t rc, const char *src,
                          (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);
-               xbt_dynar_free(&link_route_to_test);
        }
        else
        {
                  if(!route->dst_gateway && !route->src_gateway)
                          XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-                 else
+                 else{
                          XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
                                 route->src_gateway, dst, route->dst_gateway);
+                         if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+                                 xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+                         if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+                                 xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+                 }
              TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1);
              xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0);
        }
@@ -1412,7 +1417,6 @@ static void model_full_set_route(routing_component_t rc, const char *src,
                              (void*)link_route_to_test,
                                  (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
                                  "The route between \"%s\" and \"%s\" already exists", src,dst);
-                       xbt_dynar_free(&link_route_to_test);
                }
                else
                {
@@ -1741,16 +1745,19 @@ static void model_floyd_set_route(routing_component_t rc, const char *src,
                          (void*)link_route_to_test,
                          (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
                          "The route between \"%s\" and \"%s\" already exists", src,dst);
-               xbt_free(link_route_to_test);
        }
        else
        {
                if(!route->dst_gateway && !route->src_gateway)
                  XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-               else
-                 XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+               else{
+                       XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
                                 route->src_gateway, dst, route->dst_gateway);
-
+                       if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+                               xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+                       if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+                               xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+               }
            TO_FLOYD_LINK(*src_id, *dst_id) =
                        generic_new_extended_route(rc->hierarchy, route, 1);
            TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
@@ -2225,7 +2232,7 @@ static void *model_dijkstra_both_create(int cached)
   new_component->generic_routing.set_autonomous_system =
       generic_set_autonomous_system;
   new_component->generic_routing.set_route = model_dijkstra_both_set_route;
-  new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; //TODO
+  new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route;
   new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
   new_component->generic_routing.get_route = dijkstra_get_route;
   new_component->generic_routing.get_latency = generic_get_link_latency;
@@ -2315,9 +2322,14 @@ static void model_dijkstra_both_set_route (routing_component_t rc, const char *s
 
        if(!route->dst_gateway && !route->src_gateway)
          XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-       else
+       else{
          XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
                         route->src_gateway, dst, route->dst_gateway);
+         if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+                 xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+         if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+                 xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+       }
 
        route_extended_t e_route =
                generic_new_extended_route(current_routing->hierarchy, route, 1);