Verify if elements src_gateway and dst_gateway are present in global_routing.

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 30de78e..72c4bc0 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -214,7 +214,7 @@ static double vivaldi_get_link_latency (routing_component_t rc,const char *src,
 /**
  * \brief Add a "host" to the network element list
  */
-void parse_S_host(const char *host_id, const char* coord)
+static void parse_S_host(const char *host_id, const char* coord)
 {
   network_element_info_t info = NULL;
   if (current_routing->hierarchy == SURF_ROUTING_NULL)
@@ -305,7 +305,7 @@ static void parse_S_router(void)
 /**
  * \brief Set the endponints for a route
  */
-void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
+static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
 {
   if (src != NULL && dst != NULL && link_list != NULL)
     THROW2(arg_error, 0, "Route between %s to %s can not be defined",
@@ -377,7 +377,7 @@ static void parse_S_bypassRoute_new_and_endpoints(void)
 /**
  * \brief Set a new link on the actual list of link for a route or ASroute
  */
-void parse_E_link_ctn_new_elem(const char *link_id)
+static void parse_E_link_ctn_new_elem(const char *link_id)
 {
   char *val;
   val = xbt_strdup(link_id);
@@ -415,7 +415,7 @@ static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
 /**
  * \brief Store the route by calling the set_route function of the current routing component
  */
-void parse_E_route_store_route(void)
+static void parse_E_route_store_route(void)
 {
   name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
   route->generic_route.link_list = link_list;
@@ -475,7 +475,7 @@ static void parse_E_bypassRoute_store_route(void)
  * make the new structure and
  * set the parsing functions to allows parsing the part of the routing tree
  */
-void parse_S_AS(char *AS_id, char *AS_routing)
+static void parse_S_AS(char *AS_id, char *AS_routing)
 {
   routing_component_t new_routing;
   model_type_t model = NULL;
@@ -570,7 +570,7 @@ static void parse_S_AS_lua(char *id, char *mode)
  * When you finish to read the routing component, other structures must be created. 
  * the "end" method allow to do that for any routing model type
  */
-void parse_E_AS(const char *AS_id)
+static void parse_E_AS(const char *AS_id)
 {
 
   if (current_routing == NULL) {
@@ -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;
 }
 
@@ -1378,9 +1379,14 @@ static void model_full_set_route(routing_component_t rc, const char *src,
        {
                  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);
        }
@@ -1747,10 +1753,14 @@ static void model_floyd_set_route(routing_component_t rc, const char *src,
        {
                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 +2235,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 +2325,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);
@@ -2632,7 +2647,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc,
       if (rc_dst >= 0) {
         res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src);
         xbt_assert1(!res, "error solving substring list for src \"%s\"", src);
-        res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst)
+        res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst);
         xbt_assert1(!res, "error solving substring list for src \"%s\"", dst);
         char *link_name;
         xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) {