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

diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c
index 7285eaecda..a893b25276 100644
--- a/teshsuite/simdag/platforms/flatifier.c
+++ b/teshsuite/simdag/platforms/flatifier.c
@@ -46,31 +46,35 @@ static int name_compare_links(const void *n1, const void *n2)
 int main(int argc, char **argv)
 {
   char *platformFile = NULL;
-  int totalHosts, totalLinks, tmp_length;
-  int j, k;
+  int totalHosts, totalLinks;
   unsigned int i;
   xbt_dict_t props = NULL;
   xbt_dict_cursor_t cursor = NULL;
-  xbt_dict_cursor_t cursor_src = NULL;
-  xbt_dict_cursor_t cursor_dst = NULL;
+  xbt_lib_cursor_t cursor_src = NULL;
+  xbt_lib_cursor_t cursor_dst = NULL;
   char *src,*dst,*key,*data;
+  network_element_t value1;
+  network_element_t value2;
   xbt_ex_t e;
 
   const SD_workstation_t *hosts;
-  const SD_link_t *links, *tmp;
+  const SD_link_t *links;
+
+  setvbuf(stdout, NULL, _IOLBF, 0);
 
   SD_init(&argc, argv);
 
   platformFile = argv[1];
-  DEBUG1("%s", platformFile);
+  XBT_DEBUG("%s", platformFile);
   TRY {
     SD_create_environment(platformFile);
-  } CATCH(e) {
-    xbt_die(bprintf("Error while loading %s: %s",platformFile,e.msg));     
+  }
+  CATCH(e) {
+    xbt_die("Error while loading %s: %s",platformFile,e.msg);
   }
 
   printf("<?xml version='1.0'?>\n");
-  printf("<!DOCTYPE platform SYSTEM \"simgrid.dtd\">\n");
+  printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid.dtd\">\n");
   printf("<platform version=\"3\">\n");
   printf("<AS id=\"AS0\" routing=\"Full\">\n");
 
@@ -85,7 +89,7 @@ int main(int argc, char **argv)
            SD_workstation_get_name(hosts[i]),
            SD_workstation_get_power(hosts[i]));
     props = SD_workstation_get_properties(hosts[i]);
-    if (xbt_dict_length(props) > 0) {
+    if (props && !xbt_dict_is_empty(props)) {
       printf(">\n");
       xbt_dict_foreach(props, cursor, key, data) {
         printf("    <prop id=\"%s\" value=\"%s\"/>\n", key, data);
@@ -97,9 +101,9 @@ int main(int argc, char **argv)
   }
 
   // Routers
-  xbt_dict_foreach(global_routing->where_network_elements, cursor, key, data) {
-	  if(((network_element_info_t)xbt_dict_get(global_routing->where_network_elements, key))->rc_type
-			  == SURF_NETWORK_ELEMENT_ROUTER)
+  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);
 	  }
@@ -108,6 +112,7 @@ int main(int argc, char **argv)
   // Links
   totalLinks = SD_link_get_number();
   links = SD_link_get_list();
+
   qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
 
   for (i = 0; i < totalLinks; i++) {
@@ -124,35 +129,90 @@ int main(int argc, char **argv)
     }
   }
 
-  // Routes
-  xbt_dict_foreach(global_routing->where_network_elements, cursor_src, src, data)
+
+  xbt_lib_foreach(host_lib, cursor_src, src, value1) // Routes from host
   {
-	  if(((network_element_info_t)xbt_dict_get(global_routing->where_network_elements, src))->rc_type
-			  == SURF_NETWORK_ELEMENT_ROUTER ||
-			  ((network_element_info_t)xbt_dict_get(global_routing->where_network_elements, src))->rc_type
-			  == SURF_NETWORK_ELEMENT_HOST)
-	  {
-		  xbt_dict_foreach(global_routing->where_network_elements, cursor_dst, dst, data)
+          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;
+				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 *);
+
+					char *link_name = xbt_strdup(((surf_resource_t)link)->name);
+					printf("<link_ctn id=\"%s\"/>",link_name);
+					free(link_name);
+				}
+				printf("\n  </route>\n");
+		  }
+		  xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2) //to router
 		  {
-			  if(((network_element_info_t)xbt_dict_get(global_routing->where_network_elements, dst))->rc_type
-					  == SURF_NETWORK_ELEMENT_ROUTER ||
-					  ((network_element_info_t)xbt_dict_get(global_routing->where_network_elements, dst))->rc_type
-					  == SURF_NETWORK_ELEMENT_HOST)
-			  {
-				printf("  <route src=\"%s\" dst=\"%s\">\n	"
+			    if(routing_get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+				printf("  <route src=\"%s\" dst=\"%s\">\n  "
 					  ,src
 					  ,dst);
-				xbt_dynar_t route = global_routing->get_route(src,dst);
+				xbt_dynar_t 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 *);
 
-					char *link_name = bprintf("%s",((surf_resource_t) link)->name);
+					char *link_name = xbt_strdup(((surf_resource_t)link)->name);
 					printf("<link_ctn id=\"%s\"/>",link_name);
+					free(link_name);
 				}
 				printf("\n  </route>\n");
+			    }
+		  }
+  }
 
-			  }
+  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, 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;
+				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 *);
+
+					char *link_name = xbt_strdup(((surf_resource_t)link)->name);
+					printf("<link_ctn id=\"%s\"/>",link_name);
+					free(link_name);
+				}
+				printf("\n  </route>\n");
+				}
+		  }
+		  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;
+				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 *);
+
+					char *link_name = xbt_strdup(((surf_resource_t)link)->name);
+					printf("<link_ctn id=\"%s\"/>",link_name);
+					free(link_name);
+				}
+				printf("\n  </route>\n");
 		  }
 	  }
   }