X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa8dc48a0d60d1d31c89c0d2add46680119444d9..9d765a692e8aae0c06d16ce6d7db2acdd0b3b63d:/src/surf/surf_routing_vivaldi.c

diff --git a/src/surf/surf_routing_vivaldi.c b/src/surf/surf_routing_vivaldi.c
index 9e7ddfeede..6ba2ebedb9 100644
--- a/src/surf/surf_routing_vivaldi.c
+++ b/src/surf/surf_routing_vivaldi.c
@@ -7,34 +7,27 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
 
-/* Business methods */
-static route_t vivaldi_get_route(AS_t rc, const char *src, const char *dst)
-{
-	  xbt_assert(rc && src
-	              && dst,
-	              "Invalid params for \"get_route\" function at AS \"%s\"",
-	              rc->name);
-
-	  route_t new_e_route = xbt_new0(s_route_t, 1);
-	  new_e_route->src_gateway = ROUTER_PEER(src);
-	  new_e_route->dst_gateway = ROUTER_PEER(dst);
-	  new_e_route->link_list =  xbt_dynar_new(0, NULL);
-	  return new_e_route;
-}
-
-static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
-{
-	double src_coord, dst_coord;
+static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) {
+  double src_coord, dst_coord;
 
   src_coord = xbt_dynar_get_as(src, index, double);
   dst_coord = xbt_dynar_get_as(dst, index, double);
 
-	return (src_coord-dst_coord)*(src_coord-dst_coord);
-
+  return (src_coord-dst_coord)*(src_coord-dst_coord);
 }
 
-static double base_vivaldi_get_latency (const char *src, const char *dst)
+static void vivaldi_get_route_and_latency(
+    AS_t rc, const char *src_p, const char *dst_p,
+    route_t route, double *lat)
 {
+  char *src = (char*)src_p;
+  char *dst = (char*)dst_p;
+
+  if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
+    src = route->src_gateway = ROUTER_PEER(src);
+    dst = route->dst_gateway = ROUTER_PEER(dst);
+  }
+
   double euclidean_dist;
   xbt_dynar_t src_ctn, dst_ctn;
   src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL);
@@ -42,35 +35,22 @@ static double base_vivaldi_get_latency (const char *src, const char *dst)
   dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL);
   if(!dst_ctn) dst_ctn = xbt_lib_get_or_null(as_router_lib, dst, COORD_ASR_LEVEL);
 
-  if(dst_ctn == NULL || src_ctn == NULL)
-  xbt_die("Coord src '%s' :%p   dst '%s' :%p",src,src_ctn,dst,dst_ctn);
+  xbt_assert(src_ctn,"No coordinate found for element '%s'",src);
+  xbt_assert(dst_ctn,"No coordinate found for element '%s'",dst);
 
   euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn))
-  				 + fabs(xbt_dynar_get_as(src_ctn, 2, double))+fabs(xbt_dynar_get_as(dst_ctn, 2, double));
+	               + fabs(xbt_dynar_get_as(src_ctn, 2, double))+fabs(xbt_dynar_get_as(dst_ctn, 2, double));
 
-  //From .ms to .s
-  return euclidean_dist / 1000;
-}
+  if (lat)
+    *lat += euclidean_dist / 1000; //From .ms to .s
 
-static double vivaldi_get_latency (AS_t rc,const char *src, const char *dst, route_t e_route)
-{
-  if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) {
-	  int need_to_clean = e_route?0:1;
-	  double latency;
-	  e_route = e_route ? e_route : rc->get_route(rc, src, dst);
-	  latency = base_vivaldi_get_latency(e_route->src_gateway,e_route->dst_gateway);
-	  if(need_to_clean) generic_free_route(e_route);
-	  return latency;
-  } else {
-	  return base_vivaldi_get_latency(src,dst);
-  }
 }
 
+
 /* Creation routing model functions */
 AS_t model_vivaldi_create(void)
 {
 	  AS_t new_component = model_rulebased_create();
-	  new_component->get_route = vivaldi_get_route;
-	  new_component->get_latency = vivaldi_get_latency;
+	  new_component->get_route_and_latency = vivaldi_get_route_and_latency;
 	  return new_component;
 }