X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b4740f2c34e232bcf203b9407af5637acaecaec..74c1bf2b26c5a3aa0d8c29674dc12993e7c0de15:/teshsuite/simdag/flatifier/flatifier.cpp?ds=sidebyside diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index d654328b4f..6c3083218e 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -13,25 +13,16 @@ #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" +#include 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 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 std::strcmp(sg_link_name(*(SD_link_t *) n1),sg_link_name(*(SD_link_t *) n2)); -} - static bool parse_cmdline(int* timings, char** platformFile, int argc, char** argv) { 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")) { + if (not std::strcmp(argv[i], "--timings")) { *timings = 1; } else { parse_ok = false; @@ -59,10 +50,7 @@ static void create_environment(xbt_os_timer_t parse_time, const char *platformFi static void dump_platform() { int version = 4; - xbt_dict_t props = nullptr; - xbt_dict_cursor_t cursor = nullptr; - char* key; - char* data; + std::map* props = nullptr; std::printf("\n"); std::printf("\n"); @@ -72,18 +60,19 @@ static void dump_platform() // 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); + 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(" 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()); + 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 && !xbt_dict_is_empty(props)) { + if (props && not props->empty()) { std::printf(">\n"); - xbt_dict_foreach (props, cursor, key, data) { - std::printf(" \n", key, data); + for (auto const& kv : *props) { + std::printf(" \n", kv.first.c_str(), kv.second.c_str()); } std::printf(" \n"); } else { @@ -93,13 +82,13 @@ static void dump_platform() // Routers std::vector netcardList; - simgrid::s4u::Engine::instance()->netpointList(&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(); }); - for (auto srcCard : netcardList) + for (auto const& srcCard : netcardList) if (srcCard->isRouter()) std::printf(" \n", srcCard->cname()); @@ -107,7 +96,8 @@ static void dump_platform() 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::sort(links, links + totalLinks, + [](simgrid::s4u::Link* a, simgrid::s4u::Link* b) { return strcmp(sg_link_name(a), sg_link_name(b)) < 0; }); for (unsigned int i = 0; i < totalLinks; i++) { simgrid::s4u::Link* link = links[i]; @@ -129,44 +119,44 @@ static void dump_platform() 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) + if (not route.empty()) { + std::printf(" \n ", host1->getCname(), host2->getCname()); + for (auto const& link : route) std::printf("", link->cname()); std::printf("\n \n"); } } - for (auto netcardDst : netcardList) { // to router + for (auto const& netcardDst : netcardList) { // to router if (netcardDst->isRouter()) { - std::printf(" \n ", host1->cname(), netcardDst->cname()); + std::printf(" \n ", host1->getCname(), netcardDst->cname()); std::vector route; simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr); - for (auto link : route) + for (auto const& link : route) std::printf("", link->cname()); std::printf("\n \n"); } } } - for (auto value1 : netcardList) { // Routes from router + for (auto const& value1 : netcardList) { // Routes from router if (value1->isRouter()) { - for (auto value2 : netcardList) { // to router + 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 link : route) + for (auto const& 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::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 link : route) + for (auto const& link : route) std::printf("", link->cname()); std::printf("\n \n"); } @@ -202,7 +192,6 @@ int main(int argc, char** argv) dump_platform(); } - SD_exit(); xbt_os_timer_free(parse_time); return 0;