create_environment(parse_time, platformFile);
std::vector<simgrid::kernel::routing::NetPoint*> netcardList;
- simgrid::s4u::Engine::instance()->netcardList(&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();
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<Link*> route;
+ 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());
for (auto link : route)
- std::printf("<link_ctn id=\"%s\"/>",link->getName());
+ 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::vector<Link*> route;
+ 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->getName());
+ std::printf("<link_ctn id=\"%s\"/>", link->cname());
std::printf("\n </route>\n");
}
}
for (auto value2 : netcardList) { // to router
if (value2->isRouter()) {
std::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->cname(), value2->cname());
- std::vector<Link*> route;
+ 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->getName());
+ std::printf("<link_ctn id=\"%s\"/>", link->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<Link*> route;
+ std::vector<simgrid::surf::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->getName());
+ std::printf("<link_ctn id=\"%s\"/>", link->cname());
std::printf("\n </route>\n");
}
}