From 4edbb8bc7f57b17b10ff9e130cd66b634840002c Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 2 Mar 2017 21:59:28 +0100 Subject: [PATCH] split a big blurb into a separate function to reduce the level of conditionnal nesting --- teshsuite/simdag/flatifier/flatifier.cpp | 222 ++++++++++++----------- 1 file changed, 113 insertions(+), 109 deletions(-) diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index cfd41ebed2..6675df2343 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -35,22 +35,22 @@ static int name_compare_links(const void *n1, const void *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) +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 (std::strlen(argv[i]) > 1 && argv[i][0] == '-' && argv[i][1] == '-') { if (!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) @@ -65,28 +65,41 @@ static void create_environment(xbt_os_timer_t parse_time, const char *platformFi } } -int main(int argc, char **argv) +static void dump_platform() { - char *platformFile = nullptr; - int timings=0; int version = 4; - unsigned int i; 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); - - if (parse_cmdline(&timings, &platformFile, argc, argv) || !platformFile) { - xbt_die("Invalid command line arguments: expected [--timings] platformFile"); + 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::qsort((void*)hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts); + + for (unsigned int i = 0; i < totalHosts; i++) { + std::printf(" cname(), sg_host_speed(hosts[i])); + props = sg_host_get_properties(hosts[i]); + if (hosts[i]->coreCount() > 1) { + std::printf(" core=\"%d\"", hosts[i]->coreCount()); + } + if (props && !xbt_dict_is_empty(props)) { + std::printf(">\n"); + xbt_dict_foreach (props, cursor, key, data) { + std::printf(" \n", key, data); + } + std::printf(" \n"); + } else { + std::printf("/>\n"); + } } - XBT_DEBUG("%d,%s", timings, platformFile); - - create_environment(parse_time, platformFile); - + // Routers std::vector netcardList; simgrid::s4u::Engine::instance()->netpointList(&netcardList); std::sort(netcardList.begin(), netcardList.end(), @@ -94,116 +107,107 @@ int main(int argc, char **argv) return a->name() < b->name(); }); - if (timings) { - XBT_INFO("Parsing time: %fs (%zu hosts, %d links)", xbt_os_timer_elapsed(parse_time), - sg_host_count(), sg_link_count()); - } else { - 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::qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts); - - for (i = 0; i < totalHosts; i++) { - std::printf(" cname(), sg_host_speed(hosts[i])); - props = sg_host_get_properties(hosts[i]); - if (hosts[i]->coreCount()>1) { - std::printf(" core=\"%d\"", hosts[i]->coreCount()); - } - if (props && !xbt_dict_is_empty(props)) { - std::printf(">\n"); - xbt_dict_foreach(props, cursor, key, data) { - std::printf(" \n", key, data); - } - std::printf(" \n"); - } else { - std::printf("/>\n"); - } - } + for (auto srcCard : netcardList) + if (srcCard->isRouter()) + std::printf(" \n", srcCard->cname()); - // Routers - for (auto srcCard : netcardList) - if (srcCard->isRouter()) - std::printf(" \n", srcCard->cname()); + // Links + unsigned int totalLinks = sg_link_count(); + simgrid::s4u::Link** links = sg_link_list(); - // Links - unsigned int totalLinks = sg_link_count(); - simgrid::s4u::Link** links = sg_link_list(); + std::qsort((void*)links, totalLinks, sizeof(SD_link_t), name_compare_links); - std::qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links); + for (unsigned int i = 0; i < totalLinks; i++) { + simgrid::s4u::Link* link = links[i]; + std::printf(" name(), link->bandwidth(), link->latency()); + if (sg_link_is_shared(link)) { + std::printf("/>\n"); + } else { + std::printf(" sharing_policy=\"FATPIPE\"/>\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"); + 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 (!route.empty()) { + std::printf(" \n ", host1->cname(), host2->cname()); + for (auto link : route) + std::printf("", link->cname()); + std::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::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]; + for (auto netcardDst : netcardList) { // to router + if (netcardDst->isRouter()) { + std::printf(" \n ", host1->cname(), netcardDst->cname()); std::vector route; - simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint; 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->cname()); - std::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->cname()); - std::printf("\n \n"); - } + for (auto link : route) + std::printf("", link->cname()); + std::printf("\n \n"); } } + } - for (auto value1 : netcardList) { // Routes from router - if (value1->isRouter()){ - 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->cname()); - std::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()); + for (auto value1 : netcardList) { // Routes from router + if (value1->isRouter()) { + for (auto value2 : netcardList) { // to router + if (value2->isRouter()) { + std::printf(" \n ", value1->cname(), value2->cname()); std::vector route; - simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint; - simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, netcardDst, &route, nullptr); + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr); for (auto link : route) std::printf("", link->cname()); std::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::NetPoint* netcardDst = host2->pimpl_netpoint; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, netcardDst, &route, nullptr); + for (auto link : route) + std::printf("", link->cname()); + std::printf("\n \n"); + } } + } - std::printf("\n"); - std::printf("\n"); - std::free(hosts); - std::free(links); + std::printf("\n"); + std::printf("\n"); + std::free(hosts); + std::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(); -- 2.20.1