X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c1103c3a2b794d6f7e4599cf0182d72937b9a021..05736ee0ede974fcf9fb60a13a40c50d62fcc19d:/teshsuite/simdag/flatifier/flatifier.cpp
diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index ffa3c588fe..cfd41ebed2 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -132,16 +132,16 @@ int main(int argc, char **argv)
// Links
unsigned int totalLinks = sg_link_count();
- SD_link_t *links = sg_link_list();
+ simgrid::s4u::Link** links = sg_link_list();
std::qsort((void *) links, totalLinks, sizeof(SD_link_t), name_compare_links);
for (i = 0; i < totalLinks; i++) {
+ simgrid::s4u::Link* link = links[i];
std::printf(" name(), link->bandwidth(), link->latency());
+ if (sg_link_is_shared(link)) {
std::printf("/>\n");
} else {
std::printf(" sharing_policy=\"FATPIPE\"/>\n");
@@ -153,23 +153,23 @@ int main(int argc, char **argv)
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 route;
+ 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)
- std::printf("",link->getName());
+ std::printf("", link->cname());
std::printf("\n \n");
}
}
for (auto netcardDst : netcardList) { // to router
if (netcardDst->isRouter()) {
std::printf(" \n ", host1->cname(), netcardDst->cname());
- std::vector route;
+ std::vector route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
for (auto link : route)
- std::printf("",link->getName());
+ std::printf("", link->cname());
std::printf("\n \n");
}
}
@@ -180,21 +180,21 @@ int main(int argc, char **argv)
for (auto value2 : netcardList) { // to router
if (value2->isRouter()) {
std::printf(" \n ", value1->cname(), value2->cname());
- std::vector route;
+ std::vector route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr);
for (auto link : route)
- std::printf("",link->getName());
+ 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::vector route;
+ std::vector 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->getName());
+ std::printf("", link->cname());
std::printf("\n \n");
}
}