From da3ea9b870ffe9feab9c7fc00236d432ec9c684d Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 25 Feb 2016 10:40:40 +0100 Subject: [PATCH] factor host samples, update flatifier --- teshsuite/simdag/platforms/CMakeLists.txt | 7 +- .../simdag/platforms/basic_parsing_test.tesh | 24 +-- .../simdag/platforms/{bob.fail => carol.fail} | 0 teshsuite/simdag/platforms/erin.avail | 4 + teshsuite/simdag/platforms/flatifier.cpp | 117 ++++------ teshsuite/simdag/platforms/flatifier.tesh | 200 +++++++----------- .../simdag/platforms/host_attributes.xml | 26 +++ teshsuite/simdag/platforms/one_host.xml | 7 - .../platforms/one_host_availability.xml | 7 - .../simdag/platforms/one_host_properties.xml | 11 - .../simdag/platforms/one_host_state_file.xml | 7 - .../simdag/platforms/one_host_trace_file.xml | 9 - .../platforms/one_host_trace_inside.xml | 14 -- 13 files changed, 145 insertions(+), 288 deletions(-) rename teshsuite/simdag/platforms/{bob.fail => carol.fail} (100%) create mode 100644 teshsuite/simdag/platforms/erin.avail create mode 100644 teshsuite/simdag/platforms/host_attributes.xml delete mode 100644 teshsuite/simdag/platforms/one_host.xml delete mode 100644 teshsuite/simdag/platforms/one_host_availability.xml delete mode 100644 teshsuite/simdag/platforms/one_host_properties.xml delete mode 100644 teshsuite/simdag/platforms/one_host_state_file.xml delete mode 100644 teshsuite/simdag/platforms/one_host_trace_file.xml delete mode 100644 teshsuite/simdag/platforms/one_host_trace_inside.xml diff --git a/teshsuite/simdag/platforms/CMakeLists.txt b/teshsuite/simdag/platforms/CMakeLists.txt index bcfa70b983..5a929ef613 100644 --- 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 5fa9374e2d..31aa1105e8 100644 --- 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 index 0000000000..3f3d3a2c11 --- /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 c46abfccec..6b347b70bf 100644 --- 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("\n"); - printf("\n"); + printf("\n"); printf("\n", version); - if (!downgrade) - printf("\n"); + printf("\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(" 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(" \n",key); } } @@ -171,10 +145,8 @@ int main(int argc, char **argv) for (i = 0; i < totalLinks; 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(" \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\n ", src, dst); + for(i=0;i",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 \n"); } - printf("\n \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(" \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",link_ctn,surf_resource_name((surf_cpp_resource_t)link)); } printf("\n \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(" \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\n"); } - } - xbt_dict_foreach(host_list, cursor_dst, dst, value2) //to host - { - printf(" \n " - ,src, dst); + } + xbt_dict_foreach(host_list, cursor_dst, dst, value2){ //to host + printf(" \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\n"); + printf("\n"); printf("\n"); } SD_exit(); diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh index 3db5c7c731..55391b0901 100644 --- 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. > -> -> +> +> > -> -> -> -> -> +> +> +> +> +> > > > @@ -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. > -> -> +> +> > -> -> -> -> -> +> +> +> +> +> > > > @@ -269,88 +269,34 @@ $ ${bindir:=.}/flatifier$EXEEXT one_cluster_multicore.xml "--log=root.fmt:[%10.6 > > -$ ${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. > -> -> +> +> > -> -> -> -> -> -> -> - -$ ${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. -> -> -> -> -> +> +> +> +> > > > > +> > -> +> > > -> -> - -$ ${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. -> -> -> -> -> -> -> +> > > -> -> - -$ ${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. -> -> -> -> -> -> -> +> > > -> -> - -$ ${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. -> -> -> -> -> -> -> +> > > -> -> - -$ ${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. -> -> -> -> -> -> > > > @@ -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. > -> -> +> +> > -> +> > > > @@ -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. > -> -> +> +> > -> -> -> +> +> +> > > > @@ -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. > -> -> +> +> > -> -> -> -> -> -> -> -> -> -> +> +> +> +> +> +> +> +> +> +> > > > @@ -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. > -> -> +> +> > -> -> +> +> > > > @@ -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. > -> -> +> +> > -> -> +> +> > > > @@ -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. > -> -> +> +> > -> -> -> +> +> +> > > > @@ -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. > -> -> +> +> > -> -> -> -> -> -> -> -> -> -> -> -> +> +> +> +> +> +> +> +> +> +> +> +> > > > diff --git a/teshsuite/simdag/platforms/host_attributes.xml b/teshsuite/simdag/platforms/host_attributes.xml new file mode 100644 index 0000000000..b0d28e0674 --- /dev/null +++ b/teshsuite/simdag/platforms/host_attributes.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + 0.0 1.0 + 11.0 0.5 + 20.0 0.8 + + + + + + + diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml deleted file mode 100644 index 9d07959756..0000000000 --- a/teshsuite/simdag/platforms/one_host.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/teshsuite/simdag/platforms/one_host_availability.xml b/teshsuite/simdag/platforms/one_host_availability.xml deleted file mode 100644 index 7845c7dbfa..0000000000 --- a/teshsuite/simdag/platforms/one_host_availability.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/teshsuite/simdag/platforms/one_host_properties.xml b/teshsuite/simdag/platforms/one_host_properties.xml deleted file mode 100644 index 3691ccd8ef..0000000000 --- a/teshsuite/simdag/platforms/one_host_properties.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/teshsuite/simdag/platforms/one_host_state_file.xml b/teshsuite/simdag/platforms/one_host_state_file.xml deleted file mode 100644 index b2402d93d3..0000000000 --- a/teshsuite/simdag/platforms/one_host_state_file.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/teshsuite/simdag/platforms/one_host_trace_file.xml b/teshsuite/simdag/platforms/one_host_trace_file.xml deleted file mode 100644 index 081295ef37..0000000000 --- a/teshsuite/simdag/platforms/one_host_trace_file.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/teshsuite/simdag/platforms/one_host_trace_inside.xml b/teshsuite/simdag/platforms/one_host_trace_inside.xml deleted file mode 100644 index b558d30471..0000000000 --- a/teshsuite/simdag/platforms/one_host_trace_inside.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - 0.0 1.0 - 11.0 0.5 - 20.0 0.8 - - - - -- 2.20.1