X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a9786d0c1612118b9fc2304ea7aa36b67b232267..1d2c9c90bad5fee54b7c050cb611f6e1178fa8dc:/teshsuite/simdag/flatifier/flatifier.cpp
diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index 7d1b4999c3..f1b74a767e 100644
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -74,8 +74,6 @@ int main(int argc, char **argv)
xbt_dict_t props = nullptr;
xbt_dict_cursor_t cursor = nullptr;
char *key, *data;
- sg_netcard_t value1;
- sg_netcard_t value2;
xbt_os_timer_t parse_time = xbt_os_timer_new();
@@ -148,28 +146,26 @@ int main(int argc, char **argv)
for (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host
simgrid::s4u::Host* host1 = hosts[it_src];
- value1 = host1->pimpl_netcard;
+ simgrid::kernel::routing::NetCard* netcardSrc = host1->pimpl_netcard;
for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
simgrid::s4u::Host* host2 = hosts[it_dst];
- std::vector *route = new std::vector();
- value2 = host2->pimpl_netcard;
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
- if (! route->empty()){
+ std::vector route;
+ simgrid::kernel::routing::NetCard* netcardDst = host2->pimpl_netcard;
+ simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
+ if (!route.empty()) {
std::printf(" \n ", host1->cname(), host2->cname());
- for (auto link: *route)
+ for (auto link : route)
std::printf("",link->getName());
std::printf("\n \n");
}
- delete route;
}
- for (auto value2 : netcardList) { // to router
- if(value2->isRouter()){
- std::printf(" \n ", host1->cname(), value2->cname());
- std::vector *route = new std::vector();
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
- for (auto link : *route)
+ for (auto netcardDst : netcardList) { // to router
+ if (netcardDst->isRouter()) {
+ std::printf(" \n ", host1->cname(), netcardDst->cname());
+ std::vector route;
+ simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
+ for (auto link : route)
std::printf("",link->getName());
- delete route;
std::printf("\n \n");
}
}
@@ -180,23 +176,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 = new std::vector();
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
- for(auto link :*route)
+ std::vector route;
+ simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr);
+ for (auto link : route)
std::printf("",link->getName());
- delete route;
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 = new std::vector();
- value2 = host2->pimpl_netcard;
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, route, nullptr);
- for(auto link : *route)
+ std::vector route;
+ simgrid::kernel::routing::NetCard* netcardDst = host2->pimpl_netcard;
+ simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, netcardDst, &route, nullptr);
+ for (auto link : route)
std::printf("",link->getName());
- delete route;
std::printf("\n \n");
}
}