#include <xbt/sysdep.h>
#include <xbt/xbt_os_time.h>
-#include <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/engine.hpp"
+#include "simgrid/s4u/host.hpp"
#include <simgrid/simdag.h>
+#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/network_interface.hpp"
unsigned int i;
xbt_dict_t props = nullptr;
xbt_dict_cursor_t cursor = nullptr;
- xbt_lib_cursor_t cursor_src = nullptr;
- xbt_lib_cursor_t cursor_dst = nullptr;
- char *src,*dst,*key,*data;
- sg_netcard_t value1;
- sg_netcard_t value2;
+ char *key, *data;
xbt_os_timer_t parse_time = xbt_os_timer_new();
create_environment(parse_time, platformFile);
+ std::vector<simgrid::kernel::routing::NetCard*> netcardList;
+ simgrid::s4u::Engine::instance()->netcardList(&netcardList);
+
if (timings) {
XBT_INFO("Parsing time: %fs (%zu hosts, %d links)", xbt_os_timer_elapsed(parse_time),
sg_host_count(), sg_link_count());
std::qsort((void *) hosts, totalHosts, sizeof(sg_host_t), name_compare_hosts);
for (i = 0; i < totalHosts; i++) {
- std::printf(" <host id=\"%s\" speed=\"%.0f\"", sg_host_get_name(hosts[i]), sg_host_speed(hosts[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());
}
// Routers
- xbt_lib_foreach(as_router_lib, cursor_src, key, value1) {
- value1 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib, key, ROUTING_ASR_LEVEL);
- if(value1->isRouter()) {
- std::printf(" <router id=\"%s\"/>\n",key);
- }
- }
+ for (auto srcCard : netcardList)
+ if (srcCard->isRouter())
+ std::printf(" <router id=\"%s\"/>\n", srcCard->cname());
// Links
unsigned int totalLinks = sg_link_count();
}
}
- sg_host_t host1, host2;
for (unsigned int it_src = 0; it_src < totalHosts; it_src++) { // Routes from host
- host1 = hosts[it_src];
- value1 = sg_host_by_name(host1->name().c_str())->pimpl_netcard;
+ simgrid::s4u::Host* host1 = hosts[it_src];
+ simgrid::kernel::routing::NetCard* netcardSrc = host1->pimpl_netcard;
for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
- host2 = hosts[it_dst];
- std::vector<Link*> *route = new std::vector<Link*>();
- value2 = host2->pimpl_netcard;
- routing_platf->getRouteAndLatency(value1, value2, route,nullptr);
- if (! route->empty()){
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->name().c_str(), host2->name().c_str());
- for (auto link: *route)
+ simgrid::s4u::Host* host2 = hosts[it_dst];
+ std::vector<Link*> route;
+ simgrid::kernel::routing::NetCard* netcardDst = host2->pimpl_netcard;
+ 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("\n </route>\n");
}
- delete route;
}
- xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2){ //to router
- value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
- if(value2->isRouter()){
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->name().c_str(), dst);
- std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,nullptr);
- for (auto link : *route)
+ 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;
+ simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
+ for (auto link : route)
std::printf("<link_ctn id=\"%s\"/>",link->getName());
- delete route;
std::printf("\n </route>\n");
}
}
}
- xbt_lib_foreach(as_router_lib, cursor_src, src, value1){ // Routes from router
- value1 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
+ for (auto value1 : netcardList) { // Routes from router
if (value1->isRouter()){
- xbt_lib_foreach(as_router_lib, cursor_dst, dst, value2){ //to router
- value2 = (sg_netcard_t)xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
- if(value2->isRouter()){
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ", src, dst);
- std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route,nullptr);
- for(auto link :*route)
+ 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;
+ simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr);
+ for (auto link : route)
std::printf("<link_ctn id=\"%s\"/>",link->getName());
- delete route;
std::printf("\n </route>\n");
}
}
for (unsigned int it_dst = 0; it_dst < totalHosts; it_dst++) { // Routes to host
- host2 = hosts[it_dst];
- std::printf(" <route src=\"%s\" dst=\"%s\">\n ",src, host2->name().c_str());
- std::vector<Link*> *route = new std::vector<Link*>();
- value2 = host2->pimpl_netcard;
- routing_platf->getRouteAndLatency((sg_netcard_t)value1,(sg_netcard_t)value2,route, nullptr);
- for(auto link : *route)
+ simgrid::s4u::Host* host2 = hosts[it_dst];
+ std::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->cname(), host2->cname());
+ std::vector<Link*> 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_ctn id=\"%s\"/>",link->getName());
- delete route;
std::printf("\n </route>\n");
}
}
