X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa18a62c865069f71605e2cd658af25978ec3f1c..74c1bf2b26c5a3aa0d8c29674dc12993e7c0de15:/teshsuite/simdag/flatifier/flatifier.cpp diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index 7bb5f30514..6c3083218e 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -1,203 +1,197 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ /* 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 "src/surf/network_interface.hpp" +#include + +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Host.hpp" + #include "simgrid/simdag.h" -#include "xbt/xbt_os_time.h" -XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool"); +#include "src/kernel/routing/NetPoint.hpp" +#include "src/surf/network_interface.hpp" -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)); -} +#include -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)); -} +XBT_LOG_NEW_DEFAULT_CATEGORY(flatifier, "Logging specific to this platform parsing tool"); -static int parse_cmdline(int *timings, char **platformFile, int argc, char **argv) +static bool parse_cmdline(int* timings, char** platformFile, int argc, char** argv) { - int wrong_option = 0; + bool parse_ok = true; 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 (not std::strcmp(argv[i], "--timings")) { *timings = 1; } else { - wrong_option = 1; - break; + parse_ok = false; + break; } } else { *platformFile = argv[i]; } } - return wrong_option; + return parse_ok; } 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) +static void dump_platform() { - char *platformFile = NULL; - int timings=0; int version = 4; - 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; + std::map* props = nullptr; + + std::printf("\n"); + std::printf("\n"); + std::printf("\n", version); + std::printf("\n"); + + // Hosts + unsigned int totalHosts = sg_host_count(); + sg_host_t* hosts = sg_host_list(); + std::sort(hosts, hosts + totalHosts, + [](sg_host_t a, sg_host_t b) { return strcmp(sg_host_get_name(a), sg_host_get_name(b)) < 0; }); + + for (unsigned int i = 0; i < totalHosts; i++) { + std::printf(" getCname(), sg_host_speed(hosts[i])); + props = hosts[i]->getProperties(); + if (hosts[i]->getCoreCount() > 1) { + std::printf(" core=\"%d\"", hosts[i]->getCoreCount()); + } + if (props && not props->empty()) { + std::printf(">\n"); + for (auto const& kv : *props) { + std::printf(" \n", kv.first.c_str(), kv.second.c_str()); + } + std::printf(" \n"); + } else { + std::printf("/>\n"); + } + } - xbt_os_timer_t parse_time = xbt_os_timer_new(); + // Routers + std::vector netcardList; + simgrid::s4u::Engine::getInstance()->getNetpointList(&netcardList); + std::sort(netcardList.begin(), netcardList.end(), + [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { + return a->name() < b->name(); + }); - SD_init(&argc, argv); + for (auto const& srcCard : netcardList) + if (srcCard->isRouter()) + std::printf(" \n", srcCard->cname()); - if (parse_cmdline(&timings, &platformFile, argc, argv) || !platformFile) { - xbt_die("Invalid command line arguments: expected [--timings] platformFile"); - } + // Links + unsigned int totalLinks = sg_link_count(); + simgrid::s4u::Link** links = sg_link_list(); - XBT_DEBUG("%d,%s", timings, platformFile); + std::sort(links, links + totalLinks, + [](simgrid::s4u::Link* a, simgrid::s4u::Link* b) { return strcmp(sg_link_name(a), sg_link_name(b)) < 0; }); - create_environment(parse_time, platformFile); + for (unsigned int i = 0; i < totalLinks; i++) { + simgrid::s4u::Link* link = links[i]; + std::printf(" \n"); - printf("\n"); - printf("\n", version); - printf("\n"); - - // Hosts - unsigned int totalHosts = sg_host_count(); - sg_host_t *hosts = sg_host_list(); - qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts); - - for (i = 0; i < totalHosts; i++) { - printf(" core_count()>1) { - printf(" core=\"%d\"", hosts[i]->core_count()); - } - if (props && !xbt_dict_is_empty(props)) { - printf(">\n"); - xbt_dict_foreach(props, cursor, key, data) { - printf(" \n", key, data); - } - printf(" \n"); - } else { - printf("/>\n"); - } + std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->name(), link->bandwidth(), link->latency()); + if (sg_link_is_shared(link)) { + std::printf("/>\n"); + } else { + std::printf(" sharing_policy=\"FATPIPE\"/>\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 (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host + simgrid::s4u::Host* host1 = hosts[it_src]; + simgrid::kernel::routing::NetPoint* netcardSrc = host1->pimpl_netpoint; + 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::NetPoint* netcardDst = host2->pimpl_netpoint; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr); + if (not route.empty()) { + std::printf(" \n ", host1->getCname(), host2->getCname()); + for (auto const& link : route) + std::printf("", link->cname()); + std::printf("\n \n"); } } - - // Links - unsigned int totalLinks = sg_link_count(); - SD_link_t *links = sg_link_list(); - - qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links); - - for (i = 0; i < totalLinks; i++) { - printf(" \n"); - } else { - printf(" sharing_policy=\"FATPIPE\"/>\n"); + for (auto const& netcardDst : netcardList) { // to router + if (netcardDst->isRouter()) { + std::printf(" \n ", host1->getCname(), netcardDst->cname()); + std::vector route; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr); + for (auto const& link : route) + std::printf("", link->cname()); + std::printf("\n \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("",link->getName()); - printf("\n \n"); + for (auto const& value1 : netcardList) { // Routes from router + if (value1->isRouter()) { + for (auto const& 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 const& link : route) + std::printf("", link->cname()); + 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("",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->getCname()); + std::vector route; + simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, netcardDst, &route, nullptr); + for (auto const& link : route) + std::printf("", link->cname()); + 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); - 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("",link->getName()); - delete route; - 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("",link->getName()); - delete route; - printf("\n \n"); - } - } - } + std::printf("\n"); + std::printf("\n"); + std::free(hosts); + std::free(links); +} - printf("\n"); - printf("\n"); - free(hosts); - free(links); +int main(int argc, char** argv) +{ + char* platformFile = nullptr; + int timings = 0; + + xbt_os_timer_t parse_time = xbt_os_timer_new(); + + SD_init(&argc, argv); + + xbt_assert(parse_cmdline(&timings, &platformFile, argc, argv) && platformFile, + "Invalid command line arguments: expected [--timings] platformFile"); + + 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()); + } else { + dump_platform(); } - SD_exit(); xbt_os_timer_free(parse_time); return 0;