-/* 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 <xbt/xbt_os_time.h>
+#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 <algorithm>
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;
}
}
-static void dump_platform()
+static void dump_hosts()
{
- int version = 4;
- xbt_dict_t props = nullptr;
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- char* data;
-
- std::printf("<?xml version='1.0'?>\n");
- std::printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n");
- std::printf("<platform version=\"%d\">\n", version);
- std::printf("<AS id=\"AS0\" routing=\"Full\">\n");
-
- // Hosts
+ std::unordered_map<std::string, std::string>* props = nullptr;
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(" <host id=\"%s\" speed=\"%.0f\"", hosts[i]->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(" <host id=\"%s\" speed=\"%.0f\"", hosts[i]->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 xbt_dict_is_empty(props)) {
+ // Sort the properties before displaying them, so that the tests are perfectly reproducible
+ std::vector<std::string> keys;
+ for (auto const& kv : *props)
+ keys.push_back(kv.first);
+ if (not keys.empty()) {
std::printf(">\n");
- xbt_dict_foreach (props, cursor, key, data) {
- std::printf(" <prop id=\"%s\" value=\"%s\"/>\n", key, data);
- }
+ std::sort(keys.begin(), keys.end());
+ for (std::string key : keys)
+ std::printf(" <prop id=\"%s\" value=\"%s\"/>\n", key.c_str(), props->at(key).c_str());
std::printf(" </host>\n");
} else {
std::printf("/>\n");
}
}
+ std::free(hosts);
+}
- // Routers
- std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
- simgrid::s4u::Engine::instance()->netpointList(&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)
- if (srcCard->isRouter())
- std::printf(" <router id=\"%s\"/>\n", srcCard->cname());
-
- // Links
+static void dump_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::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];
std::printf(" <link id=\"");
- std::printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", link->name(), 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 {
}
}
+ std::free(links);
+}
+
+static void dump_routers()
+{
+ std::vector<simgrid::kernel::routing::NetPoint*> 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(" <router id=\"%s\"/>\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<simgrid::kernel::routing::NetPoint*> 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<simgrid::surf::LinkImpl*> route;
- simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint;
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
+ std::vector<simgrid::kernel::resource::LinkImpl*> 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(" <route src=\"%s\" dst=\"%s\">\n ", host1->cname(), host2->cname());
- for (auto link : route)
- std::printf("<link_ctn id=\"%s\"/>", link->cname());
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->get_cname(), host2->get_cname());
+ for (auto const& link : route)
+ std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
std::printf("\n </route>\n");
}
}
- for (auto netcardDst : netcardList) { // to router
- if (netcardDst->isRouter()) {
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->cname(), netcardDst->cname());
- std::vector<simgrid::surf::LinkImpl*> route;
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
- for (auto link : route)
- std::printf("<link_ctn id=\"%s\"/>", link->cname());
+
+ for (auto const& dst : netpoints) { // to router
+ if (dst->is_router()) {
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->get_cname(), dst->get_cname());
+ std::vector<simgrid::kernel::resource::LinkImpl*> route;
+ simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
+ for (auto const& link : route)
+ std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
std::printf("\n </route>\n");
}
}
}
- for (auto value1 : netcardList) { // Routes from router
- if (value1->isRouter()) {
- for (auto value2 : netcardList) { // to router
- if (value2->isRouter()) {
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->cname(), value2->cname());
- std::vector<simgrid::surf::LinkImpl*> route;
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr);
- for (auto link : route)
- std::printf("<link_ctn id=\"%s\"/>", link->cname());
+ 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(" <route src=\"%s\" dst=\"%s\">\n ", value1->get_cname(), value2->get_cname());
+ std::vector<simgrid::kernel::resource::LinkImpl*> route;
+ simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
+ for (auto const& link : route)
+ std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
std::printf("\n </route>\n");
}
}
for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
simgrid::s4u::Host* host2 = hosts[it_dst];
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->cname(), host2->cname());
- std::vector<simgrid::surf::LinkImpl*> route;
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->get_cname(), host2->get_cname());
+ std::vector<simgrid::kernel::resource::LinkImpl*> 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_ctn id=\"%s\"/>", link->cname());
+ simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, netcardDst, route, nullptr);
+ for (auto const& link : route)
+ std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
std::printf("\n </route>\n");
}
}
}
+ std::free(hosts);
+}
+
+static void dump_platform()
+{
+ int version = 4;
+
+ std::printf("<?xml version='1.0'?>\n");
+ std::printf("<!DOCTYPE platform SYSTEM \"https://simgrid.org/simgrid.dtd\">\n");
+ std::printf("<platform version=\"%d\">\n", version);
+ std::printf("<AS id=\"AS0\" routing=\"Full\">\n");
+
+ // Hosts
+ dump_hosts();
+
+ // Routers
+ dump_routers();
+
+ // Links
+ dump_links();
+
+ // Routes
+ dump_routes();
std::printf("</AS>\n");
std::printf("</platform>\n");
- std::free(hosts);
- std::free(links);
}
int main(int argc, char** argv)
