-/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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/kernel/routing/StarZone.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/kernel/routing/RoutedZone.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
#include "xbt/string.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_star, surf, "Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_star, ker_routing, "Kernel Star Routing");
namespace simgrid {
namespace kernel {
namespace routing {
StarZone::StarZone(const std::string& name) : ClusterZone(name) {}
-void StarZone::add_links_to_route(const std::vector<resource::LinkImpl*>& links, Route* route, double* latency,
- std::unordered_set<resource::LinkImpl*>& added_links) const
+void StarZone::add_links_to_route(const std::vector<resource::StandardLinkImpl*>& links, Route* route, double* latency,
+ std::unordered_set<resource::StandardLinkImpl*>& added_links) const
{
for (auto* link : links) {
/* do not add duplicated links in route->link_list_ */
if (not added_links.insert(link).second)
continue;
- if (latency)
- *latency += link->get_latency();
- route->link_list_.push_back(link);
+ add_link_latency(route->link_list_, link, latency);
}
}
void StarZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* latency)
{
- XBT_VERB("StarZone getLocalRoute from '%s'[%u] to '%s'[%u]", src->get_cname(), src->id(), dst->get_cname(),
+ XBT_VERB("StarZone getLocalRoute from '%s'[%lu] to '%s'[%lu]", src->get_cname(), src->id(), dst->get_cname(),
dst->id());
const auto& src_route = routes_.at(src->id());
const auto& dst_route = routes_.at(dst->id());
- std::unordered_set<resource::LinkImpl*> added_links;
+ std::unordered_set<resource::StandardLinkImpl*> added_links;
/* loopback */
if (src == dst && src_route.has_loopback()) {
add_links_to_route(src_route.loopback, route, latency, added_links);
}
}
-void StarZone::check_add_route_param(const NetPoint* src, const NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- bool symmetrical) const
+void StarZone::check_add_route_param(const NetPoint* src, const NetPoint* dst, const NetPoint* gw_src,
+ const NetPoint* gw_dst, bool symmetrical) const
{
const char* src_name = src ? src->get_cname() : "nullptr";
const char* dst_name = dst ? dst->get_cname() : "nullptr";
}
void StarZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- const std::vector<kernel::resource::LinkImpl*>& link_list_, bool symmetrical)
+ const std::vector<s4u::LinkInRoute>& link_list, bool symmetrical)
{
check_add_route_param(src, dst, gw_src, gw_dst, symmetrical);
- s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list_);
-
/* loopback */
if (src == dst) {
- routes_[src->id()].loopback = link_list_;
+ routes_[src->id()].loopback = get_link_list_impl(link_list, false);
} else {
/* src to everyone */
if (src) {
auto& route = routes_[src->id()];
- route.links_up = link_list_;
+ route.links_up = get_link_list_impl(link_list, false);
route.gateway = gw_src;
route.links_up_set = true;
if (symmetrical) {
+ auto links_down = get_link_list_impl(link_list, true);
/* reverse it for down/symmetrical links */
- route.links_down.assign(link_list_.rbegin(), link_list_.rend());
+ route.links_down.assign(links_down.rbegin(), links_down.rend());
route.links_down_set = true;
}
}
/* dst to everyone */
if (dst) {
auto& route = routes_[dst->id()];
- route.links_down = link_list_;
+ route.links_down = get_link_list_impl(link_list, false);
route.gateway = gw_dst;
route.links_down_set = true;
}