X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f0370b36545ab0b02ae09dc312a27133db6d9057..445590fd865f35e74be34955931c97b8956f6d7f:/teshsuite/simdag/platforms/flatifier.c

diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c
index 5695df80f2..a893b25276 100644
--- a/teshsuite/simdag/platforms/flatifier.c
+++ b/teshsuite/simdag/platforms/flatifier.c
@@ -53,7 +53,8 @@ int main(int argc, char **argv)
   xbt_lib_cursor_t cursor_src = NULL;
   xbt_lib_cursor_t cursor_dst = NULL;
   char *src,*dst,*key,*data;
-  char **value;
+  network_element_t value1;
+  network_element_t value2;
   xbt_ex_t e;
 
   const SD_workstation_t *hosts;
@@ -100,8 +101,8 @@ int main(int argc, char **argv)
   }
 
   // Routers
-  xbt_lib_foreach(as_router_lib, cursor_src, key, value) {
-	  if(((network_element_info_t)xbt_lib_get_or_null(as_router_lib, key,
+  xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
+	  if(((network_element_t)xbt_lib_get_or_null(as_router_lib, key,
 			  ROUTING_ASR_LEVEL))->rc_type == SURF_NETWORK_ELEMENT_ROUTER)
 	  {
 		  printf("  <router id=\"%s\"/>\n",key);
@@ -129,15 +130,17 @@ int main(int argc, char **argv)
   }
 
 
-  xbt_lib_foreach(host_lib, cursor_src, src, value) // Routes from host
+  xbt_lib_foreach(host_lib, cursor_src, src, value1) // Routes from host
   {
-		  xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
+          value1 = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL);
+		  xbt_lib_foreach(host_lib, cursor_dst, dst, value2) //to host
 		  {
 				printf("  <route src=\"%s\" dst=\"%s\">\n  "
 					  ,src
 					  ,dst);
 				xbt_dynar_t route=NULL;
-				routing_get_route_and_latency(src,dst,&route,NULL);
+				value2 = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL);
+				routing_get_route_and_latency(value1,value2,&route,NULL);
 				for(i=0;i<xbt_dynar_length(route) ;i++)
 				{
 					void *link = xbt_dynar_get_as(route,i,void *);
@@ -148,14 +151,15 @@ int main(int argc, char **argv)
 				}
 				printf("\n  </route>\n");
 		  }
-		  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
+		  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2) //to router
 		  {
 			    if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
 				printf("  <route src=\"%s\" dst=\"%s\">\n  "
 					  ,src
 					  ,dst);
 				xbt_dynar_t route=NULL;
-				routing_get_route_and_latency(src,dst,&route,NULL);
+				value2 = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+				routing_get_route_and_latency((network_element_t)value1,(network_element_t)value2,&route,NULL);
 				for(i=0;i<xbt_dynar_length(route) ;i++)
 				{
 					void *link = xbt_dynar_get_as(route,i,void *);
@@ -169,17 +173,19 @@ int main(int argc, char **argv)
 		  }
   }
 
-  xbt_lib_foreach(as_router_lib, cursor_src, src, value) // Routes from router
+  xbt_lib_foreach(as_router_lib, cursor_src, src, value1) // Routes from router
   {
+      value1 = xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
 	  if(routing_get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
-		  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value) //to router
+		  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2) //to router
 		  {
 				if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
 				printf("  <route src=\"%s\" dst=\"%s\">\n  "
 					  ,src
 					  ,dst);
 				xbt_dynar_t route=NULL;
-				routing_get_route_and_latency(src,dst,&route,NULL);
+				value2 = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+				routing_get_route_and_latency((network_element_t)value1,(network_element_t)value2,&route,NULL);
 				for(i=0;i<xbt_dynar_length(route) ;i++)
 				{
 					void *link = xbt_dynar_get_as(route,i,void *);
@@ -191,12 +197,13 @@ int main(int argc, char **argv)
 				printf("\n  </route>\n");
 				}
 		  }
-		  xbt_lib_foreach(host_lib, cursor_dst, dst, value) //to host
+		  xbt_lib_foreach(host_lib, cursor_dst, dst, value2) //to host
 		  {
 				printf("  <route src=\"%s\" dst=\"%s\">\n  "
 					  ,src, dst);
 				xbt_dynar_t route=NULL;
-				routing_get_route_and_latency(src,dst,&route, NULL);
+				value2 = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL);
+				routing_get_route_and_latency((network_element_t)value1,(network_element_t)value2,&route, NULL);
 				for(i=0;i<xbt_dynar_length(route) ;i++)
 				{
 					void *link = xbt_dynar_get_as(route,i,void *);