X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7fe4acd47d3cb1db46b1400d032dc4475d067b3..1d2c9c90bad5fee54b7c050cb611f6e1178fa8dc:/teshsuite/simdag/flatifier/flatifier.cpp diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index 730e2aae37..f1b74a767e 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -4,28 +4,43 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "simgrid/s4u/engine.hpp" +#include "simgrid/s4u/host.hpp" + +#include + +#include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" -#include "simgrid/simdag.h" -#include "xbt/xbt_os_time.h" + 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 std::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 std::strcmp(sg_link_name(*(SD_link_t *) n1),sg_link_name(*(SD_link_t *) n2)); } static int parse_cmdline(int *timings, char **platformFile, int argc, char **argv) { int wrong_option = 0; for (int i = 1; i < argc; i++) { - if (strlen(argv[i]) > 1 && argv[i][0] == '-' && argv[i][1] == '-') { - if (!strcmp(argv[i], "--timings")) { + if (std::strlen(argv[i]) > 1 && argv[i][0] == '-' && argv[i][1] == '-') { + if (!std::strcmp(argv[i], "--timings")) { *timings = 1; } else { wrong_option = 1; @@ -40,35 +55,26 @@ static int parse_cmdline(int *timings, char **platformFile, int argc, char **arg static void create_environment(xbt_os_timer_t parse_time, const char *platformFile) { - xbt_ex_t e; - TRY { + try { xbt_os_cputimer_start(parse_time); SD_create_environment(platformFile); xbt_os_cputimer_stop(parse_time); } - CATCH(e) { - xbt_die("Error while loading %s: %s", platformFile, e.msg); + catch (std::exception& e) { + xbt_die("Error while loading %s: %s", platformFile, e.what()); } } int main(int argc, char **argv) { - char *platformFile = NULL; - unsigned int totalHosts, totalLinks; + char *platformFile = nullptr; int timings=0; int version = 4; - const char *link_ctn = "link_ctn"; unsigned int i; - xbt_dict_t props = NULL; - xbt_dict_cursor_t cursor = NULL; - xbt_lib_cursor_t cursor_src = NULL; - xbt_lib_cursor_t cursor_dst = NULL; - char *src,*dst,*key,*data; - sg_netcard_t value1; - sg_netcard_t value2; - - const sg_host_t *hosts; - const SD_link_t *links; + xbt_dict_t props = nullptr; + xbt_dict_cursor_t cursor = nullptr; + char *key, *data; + xbt_os_timer_t parse_time = xbt_os_timer_new(); SD_init(&argc, argv); @@ -81,123 +87,121 @@ int main(int argc, char **argv) create_environment(parse_time, platformFile); + std::vector netcardList; + simgrid::s4u::Engine::instance()->netcardList(&netcardList); + if (timings) { 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", version); - printf("\n"); + std::printf("\n"); + std::printf("\n"); + std::printf("\n", version); + std::printf("\n"); // Hosts - totalHosts = sg_host_count(); - hosts = sg_host_list(); - qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts); + unsigned int totalHosts = sg_host_count(); + sg_host_t *hosts = sg_host_list(); + std::qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts); for (i = 0; i < totalHosts; i++) { - printf(" cname(), sg_host_speed(hosts[i])); props = sg_host_get_properties(hosts[i]); - if (hosts[i]->core_count()>1) { - printf(" core=\"%d\"", hosts[i]->core_count()); + if (hosts[i]->coreCount()>1) { + std::printf(" core=\"%d\"", hosts[i]->coreCount()); } if (props && !xbt_dict_is_empty(props)) { - printf(">\n"); + std::printf(">\n"); xbt_dict_foreach(props, cursor, key, data) { - printf(" \n", key, data); + std::printf(" \n", key, data); } - printf(" \n"); + std::printf(" \n"); } else { - printf("/>\n"); + std::printf("/>\n"); } } // 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->isRouter()) { - printf(" \n",key); - } - } + for (auto srcCard : netcardList) + if (srcCard->isRouter()) + std::printf(" \n", srcCard->cname()); // Links - totalLinks = sg_link_count(); - links = sg_link_list(); + unsigned int totalLinks = sg_link_count(); + SD_link_t *links = sg_link_list(); - qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links); + std::qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links); for (i = 0; i < totalLinks; i++) { - printf(" \n"); + std::printf("/>\n"); } else { - printf(" sharing_policy=\"FATPIPE\"/>\n"); + std::printf(" sharing_policy=\"FATPIPE\"/>\n"); } } - sg_host_t host1, host2; - 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 - std::vector *route = new std::vector(); - value2 = sg_host_by_name(dst)->pimpl_netcard; - routing_platf->getRouteAndLatency(value1, value2, route,NULL); - if (! route->empty()){ - printf(" \n ", src, dst); - for (auto link: *route) - printf("<%s id=\"%s\"/>",link_ctn,link->getName()); - printf("\n \n"); + for (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host + simgrid::s4u::Host* host1 = hosts[it_src]; + simgrid::kernel::routing::NetCard* netcardSrc = host1->pimpl_netcard; + for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host + simgrid::s4u::Host* host2 = hosts[it_dst]; + std::vector route; + simgrid::kernel::routing::NetCard* netcardDst = host2->pimpl_netcard; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr); + if (!route.empty()) { + std::printf(" \n ", host1->cname(), host2->cname()); + for (auto link : route) + std::printf("",link->getName()); + std::printf("\n \n"); } - delete route; } - 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->isRouter()){ - printf(" \n ", src, dst); - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,NULL); - for (auto link : *route) - printf("<%s id=\"%s\"/>",link_ctn,link->getName()); - delete route; - printf("\n \n"); + for (auto netcardDst : netcardList) { // to router + if (netcardDst->isRouter()) { + std::printf(" \n ", host1->cname(), netcardDst->cname()); + std::vector route; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr); + for (auto link : route) + std::printf("",link->getName()); + std::printf("\n \n"); } } } - 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); + for (auto value1 : netcardList) { // Routes from router if (value1->isRouter()){ - 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->isRouter()){ - printf(" \n ", src, dst); - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,NULL); - for(auto link :*route) - printf("<%s id=\"%s\"/>",link_ctn,link->getName()); - delete route; - printf("\n \n"); + for (auto value2 : netcardList) { // to router + if (value2->isRouter()) { + std::printf(" \n ", value1->cname(), value2->cname()); + std::vector route; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr); + for (auto link : route) + std::printf("",link->getName()); + std::printf("\n \n"); } } - xbt_dict_foreach(host_list, cursor_dst, dst, value2){ //to host - printf(" \n ",src, dst); - std::vector *route = new std::vector(); - value2 = sg_host_by_name(dst)->pimpl_netcard; - routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route, NULL); - for(auto link : *route) - printf("<%s id=\"%s\"/>",link_ctn,link->getName()); - delete route; - printf("\n \n"); + for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host + simgrid::s4u::Host* host2 = hosts[it_dst]; + std::printf(" \n ", value1->cname(), host2->cname()); + std::vector route; + simgrid::kernel::routing::NetCard* netcardDst = host2->pimpl_netcard; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, netcardDst, &route, nullptr); + for (auto link : route) + std::printf("",link->getName()); + std::printf("\n \n"); } } } - printf("\n"); - printf("\n"); + std::printf("\n"); + std::printf("\n"); + std::free(hosts); + std::free(links); } + SD_exit(); xbt_os_timer_free(parse_time);