-/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Link.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
#include <algorithm>
#include <cstring>
}
// Sort the properties before displaying them, so that the tests are perfectly reproducible
std::vector<std::string> keys;
- for (auto const& kv : *props)
- keys.push_back(kv.first);
+ for (auto const& [key, _] : *props)
+ keys.push_back(key);
if (not keys.empty()) {
std::printf(">\n");
std::sort(keys.begin(), keys.end());
for (auto src_host : hosts) { // Routes from host
const simgrid::kernel::routing::NetPoint* src = src_host->get_netpoint();
for (auto dst_host : hosts) { // Routes to host
- std::vector<simgrid::kernel::resource::LinkImpl*> route;
+ std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
const simgrid::kernel::routing::NetPoint* dst = dst_host->get_netpoint();
simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
if (route.empty())
if (not dst->is_router())
continue;
std::printf(" <route src=\"%s\" dst=\"%s\">\n ", src_host->get_cname(), dst->get_cname());
- std::vector<simgrid::kernel::resource::LinkImpl*> route;
+ std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::get_global_route(src, dst, route, nullptr);
for (auto const& link : route)
std::printf("<link_ctn id=\"%s\"/>", link->get_cname());
for (auto const& value2 : netpoints) { // to router
if (not value2->is_router())
continue;
- std::vector<simgrid::kernel::resource::LinkImpl*> route;
+ std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, value2, route, nullptr);
if (route.empty())
continue;
}
for (auto dst_host : hosts) { // Routes to host
std::printf(" <route src=\"%s\" dst=\"%s\">\n ", value1->get_cname(), dst_host->get_cname());
- std::vector<simgrid::kernel::resource::LinkImpl*> route;
+ std::vector<simgrid::kernel::resource::StandardLinkImpl*> route;
const simgrid::kernel::routing::NetPoint* netcardDst = dst_host->get_netpoint();
simgrid::kernel::routing::NetZoneImpl::get_global_route(value1, netcardDst, route, nullptr);
for (auto const& link : route)