X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b531b916a0eae7de729c2f1e99d050dbcb3ebba..3736e0252d96679e19cfbe41f3c09833d3734386:/src/surf/surf_routing_dijkstra.c

diff --git a/src/surf/surf_routing_dijkstra.c b/src/surf/surf_routing_dijkstra.c
index 02aef552de..778f37d629 100644
--- a/src/surf/surf_routing_dijkstra.c
+++ b/src/surf/surf_routing_dijkstra.c
@@ -165,12 +165,11 @@ static void add_loopback_dijkstra(as_dijkstra_t as) {
   }
 }
 
-static void dijkstra_get_route(AS_t as_generic,
-        const char *src, const char *dst, route_t route);
+static void dijkstra_get_route_and_latency(AS_t as_generic,
+        const char *src, const char *dst, route_t route, double *lat);
 
 static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
 {
- // xbt_die("\"dijkstra_get_onelink_routes\" function not implemented yet");
 	  xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
 
 	  //size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
@@ -180,7 +179,7 @@ static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
 	    xbt_dict_foreach(as->to_index, c2, k2, d2) {
 	      route_t route = xbt_new0(s_route_t,1);
 	      route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
-	      dijkstra_get_route(as, k1, k2,route);
+	      dijkstra_get_route_and_latency(as, k1, k2,route, NULL);
 
 	      if (xbt_dynar_length(route->link_list) == 1) {
 	        void *link =
@@ -202,14 +201,10 @@ static xbt_dynar_t dijkstra_get_onelink_routes(AS_t as)
 	  return ret;
 }
 
-static void dijkstra_get_route(AS_t asg,
+static void dijkstra_get_route_and_latency(AS_t asg,
                                const char *src, const char *dst,
-                               route_t route)
+                               route_t route, double *lat)
 {
-  xbt_assert(asg && src
-              && dst,
-              "Invalid params for \"get_route\" function at AS \"%s\"",
-              asg->name);
 
   /* set utils vars */
   as_dijkstra_t as = (as_dijkstra_t) asg;
@@ -217,10 +212,8 @@ static void dijkstra_get_route(AS_t asg,
   generic_src_dst_check(asg, src, dst);
   int *src_id = xbt_dict_get_or_null(asg->to_index, src);
   int *dst_id = xbt_dict_get_or_null(asg->to_index, dst);
-  xbt_assert(src_id
-              && dst_id,
-              "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",
-              src, dst);
+  if (!src_id || !dst_id)
+    THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst);
 
   int *pred_arr = NULL;
   int src_node_id = 0;
@@ -240,15 +233,13 @@ static void dijkstra_get_route(AS_t asg,
       graph_node_map_search(as, *src_id);
   graph_node_map_element_t dst_elm =
       graph_node_map_search(as, *dst_id);
-  xbt_assert(src_elm != NULL
-              && dst_elm != NULL, "src %d or dst %d does not exist",
-              *src_id, *dst_id);
+
   src_node_id = ((graph_node_data_t)
                  xbt_graph_node_get_data(src_elm->node))->graph_id;
   dst_node_id = ((graph_node_data_t)
                  xbt_graph_node_get_data(dst_elm->node))->graph_id;
 
-  /* if the src and dst are the same *//* fixed, missing in the previous version */
+  /* if the src and dst are the same */
   if (src_node_id == dst_node_id) {
 
     xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t);
@@ -256,14 +247,16 @@ static void dijkstra_get_route(AS_t asg,
     xbt_edge_t edge =
         xbt_graph_get_edge(as->route_graph, node_s_v, node_e_v);
 
-    xbt_assert(edge != NULL, "no route between host %d and %d", *src_id,
-                *dst_id);
+    if (edge == NULL)
+      THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst);
 
     e_route = (route_t) xbt_graph_edge_get_data(edge);
 
     links = e_route->link_list;
     xbt_dynar_foreach(links, cpt, link) {
       xbt_dynar_unshift(route->link_list, &link);
+      if (lat)
+        *lat += surf_network_model->extension.network.get_link_latency(link);
     }
 
   }
@@ -346,8 +339,8 @@ static void dijkstra_get_route(AS_t asg,
     xbt_edge_t edge =
         xbt_graph_get_edge(as->route_graph, node_pred_v, node_v);
 
-    xbt_assert(edge != NULL, "no route between host %d and %d", *src_id,
-                *dst_id);
+    if (edge == NULL)
+      THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst);
 
     prev_gw_src = gw_src;
 
@@ -360,14 +353,16 @@ static void dijkstra_get_route(AS_t asg,
 
     if (asg->hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id
         && strcmp(gw_dst, prev_gw_src)) {
-      xbt_dynar_t e_route_as_to_as =
-          routing_get_route(gw_dst, prev_gw_src);
-      xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
-                  gw_dst, prev_gw_src);
+      xbt_dynar_t e_route_as_to_as=NULL;
+      routing_get_route_and_latency(gw_dst, prev_gw_src,&e_route_as_to_as,NULL);
+      if (edge == NULL)
+        THROWF(arg_error,0,"No route from '%s' to '%s'",src,dst);
       links = e_route_as_to_as;
       int pos = 0;
       xbt_dynar_foreach(links, cpt, link) {
         xbt_dynar_insert_at(route->link_list, pos, &link);
+        if (lat)
+          *lat += surf_network_model->extension.network.get_link_latency(link);
         pos++;
       }
     }
@@ -375,6 +370,8 @@ static void dijkstra_get_route(AS_t asg,
     links = e_route->link_list;
     xbt_dynar_foreach(links, cpt, link) {
       xbt_dynar_unshift(route->link_list, &link);
+      if (lat)
+        *lat += surf_network_model->extension.network.get_link_latency(link);
     }
     size++;
   }
@@ -419,7 +416,7 @@ AS_t model_dijkstra_both_create(int cached)
 
   new_component->generic_routing.parse_route = model_dijkstra_both_parse_route;
   new_component->generic_routing.parse_ASroute = model_dijkstra_both_parse_route;
-  new_component->generic_routing.get_route = dijkstra_get_route;
+  new_component->generic_routing.get_route_and_latency = dijkstra_get_route_and_latency;
   new_component->generic_routing.get_onelink_routes =
       dijkstra_get_onelink_routes;
   new_component->generic_routing.finalize = dijkstra_finalize;