enhance the flatifier so that it can be used for platform parsing performance measurement

diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c
index c2e576d..de0bd15 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.c
+++ b/teshsuite/simdag/platforms/flatifier.c
@@ -22,8 +22,8 @@
 #include "surf/surf.h"
 #include "surf/surf_private.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(validator,
-                             "Logging specific to this SimDag example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier,
+                             "Logging specific to this platform parsing tool");
 
 static int name_compare_hosts(const void *n1, const void *n2)
 {
@@ -47,6 +47,7 @@ int main(int argc, char **argv)
 {
   char *platformFile = NULL;
   int totalHosts, totalLinks;
+  int timings=0;
   unsigned int i;
   xbt_dict_t props = NULL;
   xbt_dict_cursor_t cursor = NULL;
@@ -59,80 +60,92 @@ int main(int argc, char **argv)
 
   const SD_workstation_t *hosts;
   const SD_link_t *links;
+  xbt_os_timer_t parse_time = xbt_os_timer_new();
 
   setvbuf(stdout, NULL, _IOLBF, 0);
 
   SD_init(&argc, argv);
 
   platformFile = argv[1];
+  if (!strcmp(platformFile,"--timings")) {
+     platformFile=argv[2];
+     timings=1;
+  }
+      
   XBT_DEBUG("%s", platformFile);
   TRY {
+    xbt_os_timer_start(parse_time);
     SD_create_environment(platformFile);
+    xbt_os_timer_stop(parse_time);
   }
   CATCH(e) {
     xbt_die("Error while loading %s: %s",platformFile,e.msg);
   }
 
-  printf("<?xml version='1.0'?>\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");
-
-  // Hosts
-  totalHosts = SD_workstation_get_number();
-  hosts = SD_workstation_get_list();
-  qsort((void *) hosts, totalHosts, sizeof(SD_workstation_t),
+  if (timings) {
+    XBT_INFO("Parsing time: %fs (%d hosts, %d links)",
+          xbt_os_timer_elapsed(parse_time),SD_workstation_get_number(),SD_link_get_number());
+  } else {
+    printf("<?xml version='1.0'?>\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");
+
+    // Hosts
+    totalHosts = SD_workstation_get_number();
+    hosts = SD_workstation_get_list();
+    qsort((void *) hosts, totalHosts, sizeof(SD_workstation_t),
         name_compare_hosts);
 
-  for (i = 0; i < totalHosts; i++) {
-    printf("  <host id=\"%s\" power=\"%.0f\"",
-           SD_workstation_get_name(hosts[i]),
-           SD_workstation_get_power(hosts[i]));
-    props = SD_workstation_get_properties(hosts[i]);
-    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);
+    for (i = 0; i < totalHosts; i++) {
+      printf("  <host id=\"%s\" power=\"%.0f\"",
+          SD_workstation_get_name(hosts[i]),
+          SD_workstation_get_power(hosts[i]));
+      props = SD_workstation_get_properties(hosts[i]);
+      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);
+        }
+        printf("  </host>\n");
+      } else {
+        printf("/>\n");
       }
-      printf("  </host>\n");
-    } else {
-      printf("/>\n");
     }
-  }
 
-  // Routers
-  xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
-    if(((sg_routing_edge_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);
+    // Routers
+    xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
+      if(((sg_routing_edge_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);
+      }
     }
-  }
 
-  // Links
-  totalLinks = SD_link_get_number();
-  links = SD_link_get_list();
+    // Links
+    totalLinks = SD_link_get_number();
+    links = SD_link_get_list();
 
-  qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
+    qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
 
-  for (i = 0; i < totalLinks; i++) {
-    printf("  <link id=\"");
+    for (i = 0; i < totalLinks; i++) {
+      printf("  <link id=\"");
 
-    printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"",
-           SD_link_get_name(links[i]),
-           SD_link_get_current_bandwidth(links[i]),
-           SD_link_get_current_latency(links[i]));
-    if (SD_link_get_sharing_policy(links[i]) == SD_LINK_SHARED) {
-      printf("/>\n");
-    } else {
-      printf(" sharing_policy=\"FATPIPE\"/>\n");
+      printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"",
+          SD_link_get_name(links[i]),
+          SD_link_get_current_bandwidth(links[i]),
+          SD_link_get_current_latency(links[i]));
+      if (SD_link_get_sharing_policy(links[i]) == SD_LINK_SHARED) {
+        printf("/>\n");
+      } else {
+        printf(" sharing_policy=\"FATPIPE\"/>\n");
+      }
     }
-  }
 
 
-  xbt_lib_foreach(host_lib, cursor_src, src, value1) // Routes from host
-  {
-          value1 = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL);
+    xbt_lib_foreach(host_lib, cursor_src, src, value1) // Routes from 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  "
@@ -153,72 +166,73 @@ int main(int argc, char **argv)
       }
       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((sg_routing_edge_t)value1,(sg_routing_edge_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");
+        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((sg_routing_edge_t)value1,(sg_routing_edge_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(as_router_lib, cursor_src, src, value1) // 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, 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((sg_routing_edge_t)value1,(sg_routing_edge_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((sg_routing_edge_t)value1,(sg_routing_edge_t)value2,&route, NULL);
-        for(i=0;i<xbt_dynar_length(route) ;i++)
+      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((sg_routing_edge_t)value1,(sg_routing_edge_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
         {
-          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("  <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((sg_routing_edge_t)value1,(sg_routing_edge_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");
         }
-        printf("\n  </route>\n");
       }
     }
-  }
 
-  printf("</AS>\n");
-  printf("</platform>\n");
+    printf("</AS>\n");
+    printf("</platform>\n");
+  }
   SD_exit();
 
   return 0;