static void dump_platform()
{
int version = 4;
- xbt_dict_t props = nullptr;
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- char* data;
+ std::map<std::string, std::string>* props = nullptr;
std::printf("<?xml version='1.0'?>\n");
std::printf("<!DOCTYPE platform SYSTEM \"http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\">\n");
for (unsigned int i = 0; i < totalHosts; i++) {
std::printf(" <host id=\"%s\" speed=\"%.0f\"", hosts[i]->getCname(), sg_host_speed(hosts[i]));
- props = sg_host_get_properties(hosts[i]);
+ props = hosts[i]->getProperties();
if (hosts[i]->getCoreCount() > 1) {
std::printf(" core=\"%d\"", hosts[i]->getCoreCount());
}
- if (props && not xbt_dict_is_empty(props)) {
+ if (props && not props->empty()) {
std::printf(">\n");
- xbt_dict_foreach (props, cursor, key, data) {
- std::printf(" <prop id=\"%s\" value=\"%s\"/>\n", key, data);
+ for (auto const& kv : *props) {
+ std::printf(" <prop id=\"%s\" value=\"%s\"/>\n", kv.first.c_str(), kv.second.c_str());
}
std::printf(" </host>\n");
} else {
std::printf("/>\n");
}
- xbt_dict_free(&props);
}
// Routers
return a->name() < b->name();
});
- for (auto srcCard : netcardList)
+ for (auto const& srcCard : netcardList)
if (srcCard->isRouter())
std::printf(" <router id=\"%s\"/>\n", srcCard->cname());
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(netcardSrc, netcardDst, &route, nullptr);
if (not route.empty()) {
std::printf(" <route src=\"%s\" dst=\"%s\">\n ", host1->getCname(), host2->getCname());
- for (auto link : route)
+ for (auto const& link : route)
std::printf("<link_ctn id=\"%s\"/>", link->cname());
std::printf("\n </route>\n");
}
}
- for (auto netcardDst : netcardList) { // to router
+ for (auto const& netcardDst : netcardList) { // to router
if (netcardDst->isRouter()) {
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 (auto const& link : route)
std::printf("<link_ctn id=\"%s\"/>", link->cname());
std::printf("\n </route>\n");
}
}
}
- for (auto value1 : netcardList) { // Routes from router
+ for (auto const& value1 : netcardList) { // Routes from router
if (value1->isRouter()) {
- for (auto value2 : netcardList) { // to router
+ for (auto const& value2 : netcardList) { // to router
if (value2->isRouter()) {
std::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->cname(), value2->cname());
std::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(value1, value2, &route, nullptr);
- for (auto link : route)
+ for (auto const& link : route)
std::printf("<link_ctn id=\"%s\"/>", link->cname());
std::printf("\n </route>\n");
}
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)
+ for (auto const& link : route)
std::printf("<link_ctn id=\"%s\"/>", link->cname());
std::printf("\n </route>\n");
}