#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;
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;
// 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(" <host id=\"%s\" speed=\"%.0f\"", hosts[i]->cname(), sg_host_speed(hosts[i]));
+ std::printf(" <host id=\"%s\" speed=\"%.0f\"", hosts[i]->getCname(), 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 (hosts[i]->getCoreCount() > 1) {
+ std::printf(" core=\"%d\"", hosts[i]->getCoreCount());
}
- if (props && !xbt_dict_is_empty(props)) {
+ if (props && not xbt_dict_is_empty(props)) {
std::printf(">\n");
xbt_dict_foreach (props, cursor, key, data) {
std::printf(" <prop id=\"%s\" value=\"%s\"/>\n", key, data);
} else {
std::printf("/>\n");
}
+ xbt_dict_free(&props);
}
// Routers
std::vector<simgrid::kernel::routing::NetPoint*> 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();
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::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
- if (!route.empty()) {
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->cname(), host2->cname());
+ if (not route.empty()) {
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->getCname(), host2->getCname());
for (auto link : route)
std::printf("<link_ctn id=\"%s\"/>", link->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::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->getCname(), netcardDst->cname());
std::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
for (auto link : route)
}
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::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->cname(), host2->getCname());
std::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetPoint* netcardDst = host2->pimpl_netpoint;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, netcardDst, &route, nullptr);
dump_platform();
}
- SD_exit();
xbt_os_timer_free(parse_time);
return 0;