Fix compilation with tracing and new network_element_t

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

diff --git a/src/surf/surf_routing_vivaldi.c b/src/surf/surf_routing_vivaldi.c
index 05af06e..97c122d 100644 (file)
--- a/src/surf/surf_routing_vivaldi.c
+++ b/src/surf/surf_routing_vivaldi.c
@@ -14,38 +14,61 @@ static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dyn
   dst_coord = xbt_dynar_get_as(dst, index, double);
 
   return (src_coord-dst_coord)*(src_coord-dst_coord);
-
 }
 
-
 static void vivaldi_get_route_and_latency(
-    AS_t rc, const char *src_p, const char *dst_p,
+    AS_t rc, network_element_t src_p, network_element_t dst_p,
     route_t route, double *lat)
 {
-  char *src = (char*)src_p;
-  char *dst = (char*)dst_p;
+  XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]",src_p->name,src_p->id,dst_p->name,dst_p->id);
+  char *src = (char*)src_p->name;
+  char *dst = (char*)dst_p->name;
 
-  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);
+  if(src_p->rc_type == SURF_NETWORK_ELEMENT_AS) {
+    route->src_gateway = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(src),ROUTING_ASR_LEVEL);
+    route->dst_gateway = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(dst),ROUTING_ASR_LEVEL);
   }
 
   double euclidean_dist;
   xbt_dynar_t src_ctn, dst_ctn;
-  src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL);
-  if(!src_ctn) src_ctn = xbt_lib_get_or_null(as_router_lib, src, COORD_ASR_LEVEL);
-  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);
+  char *tmp_src_name, *tmp_dst_name;
 
-  if(dst_ctn == NULL || src_ctn == NULL)
-    xbt_die("Coord src '%s' :%p   dst '%s' :%p",src,src_ctn,dst,dst_ctn);
+  if(src_p->rc_type == SURF_NETWORK_ELEMENT_HOST){
+    tmp_src_name = HOST_PEER(src);
+    src_ctn = xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL);
+    if(!src_ctn ) src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL);
+  }
+  else if(src_p->rc_type == SURF_NETWORK_ELEMENT_ROUTER || src_p->rc_type == SURF_NETWORK_ELEMENT_AS){
+    tmp_src_name = ROUTER_PEER(src);
+    src_ctn = xbt_lib_get_or_null(as_router_lib, tmp_src_name, COORD_ASR_LEVEL);
+  }
+  else{
+    xbt_die(" ");
+  }
+
+  if(dst_p->rc_type == SURF_NETWORK_ELEMENT_HOST){
+    tmp_dst_name = HOST_PEER(dst);
+    dst_ctn = xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL);
+    if(!dst_ctn ) dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL);
+  }
+  else if(dst_p->rc_type == SURF_NETWORK_ELEMENT_ROUTER || dst_p->rc_type == SURF_NETWORK_ELEMENT_AS){
+    tmp_dst_name = ROUTER_PEER(dst);
+    dst_ctn = xbt_lib_get_or_null(as_router_lib, tmp_dst_name, COORD_ASR_LEVEL);
+  }
+  else{
+    xbt_die(" ");
+  }
+
+  xbt_assert(src_ctn,"No coordinate found for element '%s'",tmp_src_name);
+  xbt_assert(dst_ctn,"No coordinate found for element '%s'",tmp_dst_name);
+  free(tmp_src_name);
+  free(tmp_dst_name);
 
   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));
 
   if (lat)
     *lat += euclidean_dist / 1000; //From .ms to .s
-
 }