factor host samples, update flatifier

diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt
index bcfa70b..5a929ef 100644 (file)
--- a/teshsuite/simdag/platforms/CMakeLists.txt
+++ b/teshsuite/simdag/platforms/CMakeLists.txt
@@ -30,18 +30,13 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd_ns3.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/four_hosts_floyd.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/two_hosts_multi_hop.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/host_attributes.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/link_attributes.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_file.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_multicore.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_fullduplex.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster_router_id.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/one_cluster.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_availability.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_properties.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_state_file.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_file.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host_trace_inside.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/one_host.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_include.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/properties.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/test_of_is_router.xml

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index 5fa9374..31aa110 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -4,29 +4,9 @@ $ ${bindir:=.}/basic_parsing_test one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
 > Workstation number: 5, link number: 12
 
-$ ${bindir:=.}/basic_parsing_test one_host_availability.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/basic_parsing_test host_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 1
-
-$ ${bindir:=.}/basic_parsing_test one_host_properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 1
-
-$ ${bindir:=.}/basic_parsing_test one_host_state_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 1
-
-$ ${bindir:=.}/basic_parsing_test one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 1
-
-$ ${bindir:=.}/basic_parsing_test one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 1
-
-$ ${bindir:=.}/basic_parsing_test one_host.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> Workstation number: 1, link number: 1
+> Workstation number: 5, link number: 1
 
 $ ${bindir:=.}/basic_parsing_test link_attributes.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.

diff --git a/teshsuite/simdag/platforms/bob.fail b/teshsuite/simdag/platforms/carol.fail
similarity index 100%
rename from teshsuite/simdag/platforms/bob.fail
rename to teshsuite/simdag/platforms/carol.fail

diff --git a/teshsuite/simdag/platforms/erin.avail b/teshsuite/simdag/platforms/erin.avail
new file mode 100644 (file)
index 0000000..3f3d3a2
--- /dev/null
+++ b/teshsuite/simdag/platforms/erin.avail
@@ -0,0 +1,4 @@
+PERIODICITY 1.0
+0.0 1.0
+9.0 0.7
+15.0 0.4

diff --git a/teshsuite/simdag/platforms/flatifier.cpp b/teshsuite/simdag/platforms/flatifier.cpp
index c46abfc..6b347b7 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.cpp
+++ b/teshsuite/simdag/platforms/flatifier.cpp
@@ -23,29 +23,19 @@
 #include "surf/surf.h"
 #include "src/surf/surf_private.h"
 
-static const char link_ctn_v2[] =  "link:ctn";
-static const char link_ctn_v3[] = "link_ctn";
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier,
-                             "Logging specific to this platform parsing tool");
+XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool");
 
 static int name_compare_hosts(const void *n1, const void *n2)
 {
-  return strcmp(
-      sg_host_get_name(*(sg_host_t *) n1),
-      sg_host_get_name(*(sg_host_t *) n2)
-  );
+  return strcmp(sg_host_get_name(*(sg_host_t *) n1), sg_host_get_name(*(sg_host_t *) n2));
 }
 
 static int name_compare_links(const void *n1, const void *n2)
 {
-  return strcmp(
-      sg_link_name(*(SD_link_t *) n1),
-      sg_link_name(*(SD_link_t *) n2)
-  );
+  return strcmp(sg_link_name(*(SD_link_t *) n1),sg_link_name(*(SD_link_t *) n2));
 }
 
-static int parse_cmdline(int *timings, int *downgrade, char **platformFile, int argc, char **argv)
+static int parse_cmdline(int *timings, char **platformFile, int argc, char **argv)
 {
   int wrong_option = 0;
   int i;
@@ -54,12 +44,8 @@ static int parse_cmdline(int *timings, int *downgrade, char **platformFile, int
       if (!strcmp(argv[i], "--timings")) {
         *timings = 1;
       } else {
-        if (!strcmp(argv[i], "--downgrade")) {
-          *downgrade = 1;
-        } else {
           wrong_option = 1;
           break;
-        }
       }
     } else {
       *platformFile = argv[i];
@@ -86,9 +72,8 @@ int main(int argc, char **argv)
   char *platformFile = NULL;
   unsigned int totalHosts, totalLinks;
   int timings=0;
-  int downgrade = 0;
-  int version = 3;
-  const char *link_ctn = link_ctn_v3;
+  int version = 4;
+  const char *link_ctn = "link_ctn";
   unsigned int i;
   xbt_dict_t props = NULL;
   xbt_dict_cursor_t cursor = NULL;
@@ -104,40 +89,30 @@ int main(int argc, char **argv)
 
   SD_init(&argc, argv);
 
-  if (parse_cmdline(&timings, &downgrade, &platformFile, argc, argv) || !platformFile) {
-    xbt_die("Invalid command line arguments: expected [--timings|--downgrade] platformFile");
+  if (parse_cmdline(&timings, &platformFile, argc, argv) || !platformFile) {
+    xbt_die("Invalid command line arguments: expected [--timings] platformFile");
   }
 
-  XBT_DEBUG("%d,%d,%s", timings, downgrade, platformFile);
-
-  if (downgrade) {
-    version = 2;
-    link_ctn = link_ctn_v2;
-  }
+  XBT_DEBUG("%d,%s", timings, platformFile);
 
   create_environment(parse_time, platformFile);
 
   if (timings) {
-    XBT_INFO("Parsing time: %fs (%zu hosts, %d links)",
-          xbt_os_timer_elapsed(parse_time),sg_host_count(),
-          sg_link_count());
+    XBT_INFO("Parsing time: %fs (%zu hosts, %d links)", xbt_os_timer_elapsed(parse_time),
+             sg_host_count(), sg_link_count());
   } else {
     printf("<?xml version='1.0'?>\n");
-    printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid.dtd\">\n");
+    printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n");
     printf("<platform version=\"%d\">\n", version);
-    if (!downgrade)
-      printf("<AS id=\"AS0\" routing=\"Full\">\n");
+    printf("<AS id=\"AS0\" routing=\"Full\">\n");
 
     // Hosts
     totalHosts = sg_host_count();
     hosts = sg_host_list();
-    qsort((void *) hosts, totalHosts, sizeof(sg_host_t),
-        name_compare_hosts);
+    qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts);
 
     for (i = 0; i < totalHosts; i++) {
-      printf("  <host id=\"%s\" power=\"%.0f\"",
-          sg_host_get_name(hosts[i]),
-          sg_host_speed(hosts[i]));
+      printf("  <host id=\"%s\" speed=\"%.0f\"", sg_host_get_name(hosts[i]), sg_host_speed(hosts[i]));
       props = sg_host_get_properties(hosts[i]);
       if (sg_host_core_count(hosts[i])>1) {
         printf(" core=\"%d\"", sg_host_core_count(hosts[i]));
@@ -156,8 +131,7 @@ int main(int argc, char **argv)
     // Routers
     xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
       value1 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib, key, ROUTING_ASR_LEVEL);
-      if(value1->getRcType() == SURF_NETWORK_ELEMENT_ROUTER)
-      {
+      if(value1->getRcType() == SURF_NETWORK_ELEMENT_ROUTER) {
         printf("  <router id=\"%s\"/>\n",key);
       }
     }
@@ -171,10 +145,8 @@ int main(int argc, char **argv)
     for (i = 0; i < totalLinks; i++) {
       printf("  <link id=\"");
 
-      printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"",
-          sg_link_name(links[i]),
-          sg_link_bandwidth(links[i]),
-          sg_link_latency(links[i]));
+      printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", sg_link_name(links[i]),
+             sg_link_bandwidth(links[i]), sg_link_latency(links[i]));
       if (sg_link_is_shared(links[i])) {
         printf("/>\n");
       } else {
@@ -183,36 +155,32 @@ int main(int argc, char **argv)
     }
 
     sg_host_t host1, host2;
-    xbt_dict_foreach(host_list, cursor_src, src, host1) // Routes from host
-    {
+    xbt_dict_foreach(host_list, cursor_src, src, host1){ // Routes from host
       value1 = sg_host_by_name(src)->pimpl_netcard;
-      xbt_dict_foreach(host_list, cursor_dst, dst, host2) //to host
-      {
-        printf("  <route src=\"%s\" dst=\"%s\">\n  ", src, dst);
+      xbt_dict_foreach(host_list, cursor_dst, dst, host2){ //to host
         xbt_dynar_t route=NULL;
         value2 = sg_host_by_name(dst)->pimpl_netcard;
         routing_platf->getRouteAndLatency(value1, value2, &route,NULL);
-        for(i=0;i<xbt_dynar_length(route) ;i++)
-        {
-          void *link = xbt_dynar_get_as(route,i,void *);
+        if (!xbt_dynar_is_empty(route)){
+          printf("  <route src=\"%s\" dst=\"%s\">\n  ", src, dst);
+          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_name((surf_cpp_resource_t)link));
-          printf("<%s id=\"%s\"/>",link_ctn,link_name);
-          free(link_name);
+            char *link_name = xbt_strdup(surf_resource_name((surf_cpp_resource_t)link));
+            printf("<%s id=\"%s\"/>",link_ctn,link_name);
+            free(link_name);
+          }
+          printf("\n  </route>\n");
         }
-        printf("\n  </route>\n");
       }
-      xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2) //to router
-      {
+      xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2){ //to router
         value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
         if(value2->getRcType() == SURF_NETWORK_ELEMENT_ROUTER){
           printf("  <route src=\"%s\" dst=\"%s\">\n  ", src, dst);
           xbt_dynar_t route=NULL;
           routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,&route,NULL);
-          for(i=0;i<xbt_dynar_length(route) ;i++)
-          {
+          for(i=0;i<xbt_dynar_length(route) ;i++){
             void *link = xbt_dynar_get_as(route,i,void *);
-
             printf("<%s id=\"%s\"/>",link_ctn,surf_resource_name((surf_cpp_resource_t)link));
           }
           printf("\n  </route>\n");
@@ -220,19 +188,16 @@ int main(int argc, char **argv)
       }
     }
 
-    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 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
       if (value1->getRcType() == SURF_NETWORK_ELEMENT_ROUTER){
-        xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2) //to router
-          {
+        xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2){ //to router
           value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
           if(value2->getRcType() == SURF_NETWORK_ELEMENT_ROUTER){
             printf("  <route src=\"%s\" dst=\"%s\">\n  ", src, dst);
             xbt_dynar_t route=NULL;
             routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,&route,NULL);
-            for(i=0;i<xbt_dynar_length(route) ;i++)
-            {
+            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_name((surf_cpp_resource_t)link));
@@ -241,16 +206,13 @@ int main(int argc, char **argv)
             }
             printf("\n  </route>\n");
           }
-          }
-        xbt_dict_foreach(host_list, cursor_dst, dst, value2) //to host
-        {
-          printf("  <route src=\"%s\" dst=\"%s\">\n  "
-              ,src, dst);
+        }
+        xbt_dict_foreach(host_list, cursor_dst, dst, value2){ //to host
+          printf("  <route src=\"%s\" dst=\"%s\">\n  ",src, dst);
           xbt_dynar_t route=NULL;
           value2 = sg_host_by_name(dst)->pimpl_netcard;
           routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,&route, NULL);
-          for(i=0;i<xbt_dynar_length(route) ;i++)
-          {
+          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_name((surf_cpp_resource_t)link));
@@ -262,8 +224,7 @@ int main(int argc, char **argv)
       }
     }
 
-    if (!downgrade)
-      printf("</AS>\n");
+    printf("</AS>\n");
     printf("</platform>\n");
   }
   SD_exit();

diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index 3db5c7c..55391b0 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -3,14 +3,14 @@
 $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="bob0.hamburger.edu" power="1000000000"/>
->   <host id="bob2.hamburger.edu" power="1000000000"/>
->   <host id="bob3.hamburger.edu" power="1000000000"/>
->   <host id="bob4.hamburger.edu" power="1000000000"/>
->   <host id="bob6.hamburger.edu" power="1000000000"/>
+>   <host id="bob0.hamburger.edu" speed="1000000000"/>
+>   <host id="bob2.hamburger.edu" speed="1000000000"/>
+>   <host id="bob3.hamburger.edu" speed="1000000000"/>
+>   <host id="bob4.hamburger.edu" speed="1000000000"/>
+>   <host id="bob6.hamburger.edu" speed="1000000000"/>
 >   <router id="bobbob_cluster_router.hamburger.edu"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="bob_cluster_backbone" bandwidth="2250000000" latency="0.000500000"/>
@@ -138,14 +138,14 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P
 $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="bob0.hamburger.edu" power="1000000000" core="6"/>
->   <host id="bob2.hamburger.edu" power="1000000000" core="6"/>
->   <host id="bob3.hamburger.edu" power="1000000000" core="6"/>
->   <host id="bob4.hamburger.edu" power="1000000000" core="6"/>
->   <host id="bob6.hamburger.edu" power="1000000000" core="6"/>
+>   <host id="bob0.hamburger.edu" speed="1000000000" core="6"/>
+>   <host id="bob2.hamburger.edu" speed="1000000000" core="6"/>
+>   <host id="bob3.hamburger.edu" speed="1000000000" core="6"/>
+>   <host id="bob4.hamburger.edu" speed="1000000000" core="6"/>
+>   <host id="bob6.hamburger.edu" speed="1000000000" core="6"/>
 >   <router id="bobbob_cluster_router.hamburger.edu"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="bob_cluster_link_0_DOWN" bandwidth="125000000" latency="0.000050000"/>
@@ -269,88 +269,34 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier$EXEEXT one_host_availability.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
+$ ${bindir:=.}/flatifier$EXEEXT host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="bob" power="500000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <route src="bob" dst="bob">
->   <link_ctn id="__loopback__"/>
->   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_host_properties.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="1000000000">
+>   <host id="alice" speed="1000000000"/>
+>   <host id="bob" speed="1000000000"/>
+>   <host id="carol" speed="500000000"/>
+>   <host id="dave" speed="1000000000">
 >     <prop id="OS" value="Linux 2.6.22-14"/>
 >     <prop id="disk" value="80E9"/>
 >     <prop id="memory" value="1000000000"/>
 >   </host>
+>   <host id="erin" speed="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <route src="bob" dst="bob">
+>   <route src="dave" dst="dave">
 >   <link_ctn id="__loopback__"/>
 >   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_host_state_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="500000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <route src="bob" dst="bob">
+>   <route src="erin" dst="erin">
 >   <link_ctn id="__loopback__"/>
 >   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_file.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="1000000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <route src="bob" dst="bob">
+>   <route src="alice" dst="alice">
 >   <link_ctn id="__loopback__"/>
 >   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_host_trace_inside.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="1000000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
->   <route src="bob" dst="bob">
+>   <route src="carol" dst="carol">
 >   <link_ctn id="__loopback__"/>
 >   </route>
-> </AS>
-> </platform>
-
-$ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
-> [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
-> <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
-> <AS id="AS0" routing="Full">
->   <host id="bob" power="500000000"/>
->   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <route src="bob" dst="bob">
 >   <link_ctn id="__loopback__"/>
 >   </route>
@@ -360,10 +306,10 @@ $ ${bindir:=.}/flatifier$EXEEXT one_host.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h
 $ ${bindir:=.}/flatifier$EXEEXT link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="bob" power="500000000"/>
+>   <host id="bob" speed="500000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="link2" bandwidth="125000000" latency="0.000050000" sharing_policy="FATPIPE"/>
@@ -378,12 +324,12 @@ $ ${bindir:=.}/flatifier$EXEEXT link_attributes.xml "--log=root.fmt:[%10.6r]%e[%
 $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="alice" power="500000000"/>
->   <host id="bob" power="1000000000"/>
->   <host id="trudy" power="250000000"/>
+>   <host id="alice" speed="500000000"/>
+>   <host id="bob" speed="1000000000"/>
+>   <host id="trudy" speed="250000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="link2" bandwidth="125000000" latency="0.000050000"/>
@@ -421,19 +367,19 @@ $ ${bindir:=.}/flatifier$EXEEXT three_hosts_non_symmetric_route.xml "--log=root.
 $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="alice0.crepe.fr" power="1000000000"/>
->   <host id="alice1.crepe.fr" power="1000000000"/>
->   <host id="alice2.crepe.fr" power="1000000000"/>
->   <host id="alice3.crepe.fr" power="1000000000"/>
->   <host id="alice4.crepe.fr" power="1000000000"/>
->   <host id="bob0.hamburger.edu" power="1000000000"/>
->   <host id="bob1.hamburger.edu" power="1000000000"/>
->   <host id="bob2.hamburger.edu" power="1000000000"/>
->   <host id="bob3.hamburger.edu" power="1000000000"/>
->   <host id="bob4.hamburger.edu" power="1000000000"/>
+>   <host id="alice0.crepe.fr" speed="1000000000"/>
+>   <host id="alice1.crepe.fr" speed="1000000000"/>
+>   <host id="alice2.crepe.fr" speed="1000000000"/>
+>   <host id="alice3.crepe.fr" speed="1000000000"/>
+>   <host id="alice4.crepe.fr" speed="1000000000"/>
+>   <host id="bob0.hamburger.edu" speed="1000000000"/>
+>   <host id="bob1.hamburger.edu" speed="1000000000"/>
+>   <host id="bob2.hamburger.edu" speed="1000000000"/>
+>   <host id="bob3.hamburger.edu" speed="1000000000"/>
+>   <host id="bob4.hamburger.edu" speed="1000000000"/>
 >   <router id="bobbob_cluster_router.hamburger.edu"/>
 >   <router id="alicealice_cluster_router.crepe.fr"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
@@ -898,11 +844,11 @@ $ ${bindir:=.}/flatifier$EXEEXT two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%
 $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="alice" power="500000000"/>
->   <host id="bob" power="1000000000"/>
+>   <host id="alice" speed="500000000"/>
+>   <host id="bob" speed="1000000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link_alice" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="link_bob" bandwidth="125000000" latency="0.000050000"/>
@@ -925,11 +871,11 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]
 $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="alice" power="500000000"/>
->   <host id="bob" power="1000000000"/>
+>   <host id="alice" speed="500000000"/>
+>   <host id="bob" speed="1000000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="link1" bandwidth="125000000" latency="0.000050000"/>
 >   <route src="alice" dst="alice">
@@ -950,12 +896,12 @@ $ ${bindir:=.}/flatifier$EXEEXT two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%
 $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="1" power="1000000000"/>
->   <host id="2" power="1000000000"/>
->   <host id="3" power="1000000000"/>
+>   <host id="1" speed="1000000000"/>
+>   <host id="2" speed="1000000000"/>
+>   <host id="3" speed="1000000000"/>
 >   <router id="my_cluster_2_router"/>
 >   <router id="my_cluster_1_router"/>
 >   <router id="my_cluster_3_router"/>
@@ -1085,21 +1031,21 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm
 $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/torus_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
-> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-> <platform version="3">
+> <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+> <platform version="4">
 > <AS id="AS0" routing="Full">
->   <host id="node-0.acme.org" power="1000000000"/>
->   <host id="node-1.acme.org" power="1000000000"/>
->   <host id="node-10.acme.org" power="1000000000"/>
->   <host id="node-11.acme.org" power="1000000000"/>
->   <host id="node-2.acme.org" power="1000000000"/>
->   <host id="node-3.acme.org" power="1000000000"/>
->   <host id="node-4.acme.org" power="1000000000"/>
->   <host id="node-5.acme.org" power="1000000000"/>
->   <host id="node-6.acme.org" power="1000000000"/>
->   <host id="node-7.acme.org" power="1000000000"/>
->   <host id="node-8.acme.org" power="1000000000"/>
->   <host id="node-9.acme.org" power="1000000000"/>
+>   <host id="node-0.acme.org" speed="1000000000"/>
+>   <host id="node-1.acme.org" speed="1000000000"/>
+>   <host id="node-10.acme.org" speed="1000000000"/>
+>   <host id="node-11.acme.org" speed="1000000000"/>
+>   <host id="node-2.acme.org" speed="1000000000"/>
+>   <host id="node-3.acme.org" speed="1000000000"/>
+>   <host id="node-4.acme.org" speed="1000000000"/>
+>   <host id="node-5.acme.org" speed="1000000000"/>
+>   <host id="node-6.acme.org" speed="1000000000"/>
+>   <host id="node-7.acme.org" speed="1000000000"/>
+>   <host id="node-8.acme.org" speed="1000000000"/>
+>   <host id="node-9.acme.org" speed="1000000000"/>
 >   <router id="node-bob_cluster_router.acme.org"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="bob_cluster_link_0_loopback" bandwidth="100000000" latency="0.000000000" sharing_policy="FATPIPE"/>

diff --git a/teshsuite/simdag/platforms/host_attributes.xml b/teshsuite/simdag/platforms/host_attributes.xml
new file mode 100644 (file)
index 0000000..b0d28e0
--- /dev/null
+++ b/teshsuite/simdag/platforms/host_attributes.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <AS  id="AS0"  routing="Full">
+    <host id="alice" speed="1Gf"/> <!-- connected to an in-file speed trace --> 
+    <host id="bob" speed="1Gf"/>   <!-- connected to an out-file speed trace -->
+    <host id="carol" speed="500Mf" state_file="carol.fail"/>  <!-- out-file state trace as attribute -->
+    <host id="dave" speed="1Gf">
+      <prop id="memory" value="1000000000"/>
+      <prop id="disk" value="80E9"/>
+      <prop id="OS" value="Linux 2.6.22-14"/>
+    </host>
+    <host id="erin" speed="500Mf" availability_file="erin.avail"/> <!--uses someone else's trace --> 
+  </AS>
+
+  <trace id="myTrace" periodicity="1.0">
+    0.0 1.0
+    11.0 0.5
+    20.0 0.8
+  </trace>
+
+  <trace_connect trace="myTrace" element="alice" kind="SPEED"/>
+
+  <trace id="myTrace" file="bob.trace" periodicity="1.0"/>
+  <trace_connect trace="myTrace" element="bob" kind="SPEED"/>
+</platform>

diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml
deleted file mode 100644 (file)
index 9d07959..0000000
--- a/teshsuite/simdag/platforms/one_host.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-    <host id="bob" speed="500Mf"/>
-  </AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_host_availability.xml b/teshsuite/simdag/platforms/one_host_availability.xml
deleted file mode 100644 (file)
index 7845c7d..0000000
--- a/teshsuite/simdag/platforms/one_host_availability.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="bob" speed="500Mf" availability_file="bob.trace"/>
-</AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_host_properties.xml b/teshsuite/simdag/platforms/one_host_properties.xml
deleted file mode 100644 (file)
index 3691ccd..0000000
--- a/teshsuite/simdag/platforms/one_host_properties.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="bob" speed="1Gf">
-    <prop id="memory" value="1000000000"/>
-    <prop id="disk" value="80E9"/>
-    <prop id="OS" value="Linux 2.6.22-14"/>
-  </host>
-</AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_host_state_file.xml b/teshsuite/simdag/platforms/one_host_state_file.xml
deleted file mode 100644 (file)
index b2402d9..0000000
--- a/teshsuite/simdag/platforms/one_host_state_file.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-    <host id="bob" speed="500Mf" state_file="bob.fail"/>
-  </AS>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_host_trace_file.xml b/teshsuite/simdag/platforms/one_host_trace_file.xml
deleted file mode 100644 (file)
index 081295e..0000000
--- a/teshsuite/simdag/platforms/one_host_trace_file.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-    <host id="bob" speed="1Gf"/>  
-  </AS>
-  <trace id="myTrace" file="bob.trace" periodicity="1.0"/>
-  <trace_connect trace="myTrace" element="bob" kind="SPEED"/>
-</platform>

diff --git a/teshsuite/simdag/platforms/one_host_trace_inside.xml b/teshsuite/simdag/platforms/one_host_trace_inside.xml
deleted file mode 100644 (file)
index b558d30..0000000
--- a/teshsuite/simdag/platforms/one_host_trace_inside.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="bob" speed="1Gf"/>
-</AS>
-  <trace id="myTrace" periodicity="1.0">
-    0.0 1.0
-    11.0 0.5
-    20.0 0.8
-  </trace>
-
-  <trace_connect trace="myTrace" element="bob" kind="SPEED"/>
-</platform>