X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afd2ff03984f505acd352509ee102f086e0374a3..b8df87e176f27b25534f27d7e240defa32ca35bc:/teshsuite/simdag/flatifier/flatifier.cpp diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index 622d3bca57..bcbe27bef4 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -1,16 +1,14 @@ -/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2019. 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 +#include "simgrid/kernel/routing/NetPoint.hpp" #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" - #include "simgrid/simdag.h" - -#include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" #include @@ -47,52 +45,39 @@ static void create_environment(xbt_os_timer_t parse_time, const char *platformFi } } -static void dump_platform() +static void dump_hosts() { - int version = 4; - std::map* props = nullptr; - - std::printf("\n"); - std::printf("\n"); - std::printf("\n", version); - std::printf("\n"); - - // Hosts + std::unordered_map* props = nullptr; 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()); + std::printf(" get_cname(), sg_host_speed(hosts[i])); + props = hosts[i]->get_properties(); + if (hosts[i]->get_core_count() > 1) { + std::printf(" core=\"%d\"", hosts[i]->get_core_count()); } - if (props && not props->empty()) { + // Sort the properties before displaying them, so that the tests are perfectly reproducible + std::vector keys; + for (auto const& kv : *props) + keys.push_back(kv.first); + if (not keys.empty()) { std::printf(">\n"); - for (auto const& kv : *props) { - std::printf(" \n", kv.first.c_str(), kv.second.c_str()); - } + std::sort(keys.begin(), keys.end()); + for (std::string key : keys) + std::printf(" \n", key.c_str(), props->at(key).c_str()); std::printf(" \n"); } else { std::printf("/>\n"); } } + std::free(hosts); +} - // 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->getName() < b->getName(); - }); - - for (auto const& srcCard : netcardList) - if (srcCard->isRouter()) - std::printf(" \n", srcCard->getCname()); - - // Links +static void dump_links() +{ unsigned int totalLinks = sg_link_count(); simgrid::s4u::Link** links = sg_link_list(); @@ -103,7 +88,7 @@ static void dump_platform() simgrid::s4u::Link* link = links[i]; std::printf(" getCname(), link->bandwidth(), link->latency()); + std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->get_cname(), link->get_bandwidth(), link->get_latency()); if (sg_link_is_shared(link)) { std::printf("/>\n"); } else { @@ -111,62 +96,114 @@ static void dump_platform() } } + std::free(links); +} + +static void dump_routers() +{ + std::vector netpoints = + simgrid::s4u::Engine::get_instance()->get_all_netpoints(); + std::sort(netpoints.begin(), netpoints.end(), + [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { + return a->get_name() < b->get_name(); + }); + + for (auto const& src : netpoints) + if (src->is_router()) + std::printf(" \n", src->get_cname()); +} + +static void dump_routes() +{ + 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; }); + std::vector netpoints = + simgrid::s4u::Engine::get_instance()->get_all_netpoints(); + std::sort(netpoints.begin(), netpoints.end(), + [](simgrid::kernel::routing::NetPoint* a, simgrid::kernel::routing::NetPoint* b) { + return a->get_name() < b->get_name(); + }); + 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; + simgrid::s4u::Host* host1 = hosts[it_src]; + simgrid::kernel::routing::NetPoint* src = 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); + std::vector route; + simgrid::kernel::routing::NetPoint* dst = host2->pimpl_netpoint; + simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr); if (not route.empty()) { - std::printf(" \n ", host1->getCname(), host2->getCname()); + std::printf(" \n ", host1->get_cname(), host2->get_cname()); for (auto const& link : route) - std::printf("", link->getCname()); + std::printf("", link->get_cname()); std::printf("\n \n"); } } - for (auto const& netcardDst : netcardList) { // to router - if (netcardDst->isRouter()) { - std::printf(" \n ", host1->getCname(), netcardDst->getCname()); - std::vector route; - simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr); + + for (auto const& dst : netpoints) { // to router + if (dst->is_router()) { + std::printf(" \n ", host1->get_cname(), dst->get_cname()); + std::vector route; + simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr); for (auto const& link : route) - std::printf("", link->getCname()); + std::printf("", link->get_cname()); std::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->getCname(), value2->getCname()); - std::vector route; - simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr); + for (auto const& value1 : netpoints) { // Routes from router + if (value1->is_router()) { + for (auto const& value2 : netpoints) { // to router + if (value2->is_router()) { + std::printf(" \n ", value1->get_cname(), value2->get_cname()); + std::vector route; + simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr); for (auto const& link : route) - std::printf("", link->getCname()); + std::printf("", link->get_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->getCname(), host2->getCname()); - std::vector route; + std::printf(" \n ", value1->get_cname(), host2->get_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::get_global_route(value1, netcardDst, route, nullptr); for (auto const& link : route) - std::printf("", link->getCname()); + std::printf("", link->get_cname()); std::printf("\n \n"); } } } + std::free(hosts); +} + +static void dump_platform() +{ + int version = 4; + + std::printf("\n"); + std::printf("\n"); + std::printf("\n", version); + std::printf("\n"); + + // Hosts + dump_hosts(); + + // Routers + dump_routers(); + + // Links + dump_links(); + + // Routes + dump_routes(); std::printf("\n"); std::printf("\n"); - std::free(hosts); - std::free(links); } int main(int argc, char** argv)