-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-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/NetZoneImpl.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Host.hpp>
+#include <simgrid/s4u/VirtualMachine.hpp>
+
#include "src/include/simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/CpuImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
+#include "src/kernel/resource/SplitDuplexLinkImpl.hpp"
+#include "src/kernel/resource/StandardLinkImpl.hpp"
+#include "src/kernel/resource/VirtualMachineImpl.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp"
-#include "surf/surf.hpp"
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route);
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing, kernel, "Kernel routing-related information");
-namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace simgrid::kernel::routing {
/* Pick the right models for CPU, net and host, and call their model_init_preparse */
static void surf_config_models_setup()
xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model");
xbt_assert(not network_model_name.empty(), "Set a network model to use with the 'compound' host model");
- int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name);
- surf_cpu_model_description[cpu_id].model_init_preparse();
+ const auto* cpu_model = find_model_description(surf_cpu_model_description, cpu_model_name);
+ cpu_model->model_init_preparse();
- int network_id = find_model_description(surf_network_model_description, network_model_name);
- surf_network_model_description[network_id].model_init_preparse();
+ const auto* network_model = find_model_description(surf_network_model_description, network_model_name);
+ network_model->model_init_preparse();
}
XBT_DEBUG("Call host_model_init");
- int host_id = find_model_description(surf_host_model_description, host_model_name);
- surf_host_model_description[host_id].model_init_preparse();
+ const auto* host_model = find_model_description(surf_host_model_description, host_model_name);
+ host_model->model_init_preparse();
XBT_DEBUG("Call vm_model_init");
/* ideally we should get back the pointer to CpuModel from model_init_preparse(), but this
simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get());
XBT_DEBUG("Call disk_model_init");
- int disk_id = find_model_description(surf_disk_model_description, disk_model_name);
- surf_disk_model_description[disk_id].model_init_preparse();
+ const auto* disk_model = find_model_description(surf_disk_model_description, disk_model_name);
+ disk_model->model_init_preparse();
}
+xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+ kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+ std::vector<kernel::resource::StandardLinkImpl*> const& link_list)>
+ NetZoneImpl::on_route_creation;
+
NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name)
{
+ auto* engine = s4u::Engine::get_instance();
/* workaroud: first netzoneImpl will be the root netzone.
* Without globals and with current surf_*_model_description init functions, we need
* the root netzone to exist when creating the models.
* This was usually done at sg_platf.cpp, during XML parsing */
- if (not s4u::Engine::get_instance()->get_netzone_root())
- s4u::Engine::get_instance()->set_netzone_root(&piface_);
-
- static bool surf_parse_models_setup_already_called = false;
- if (not surf_parse_models_setup_already_called) {
+ if (not engine->get_netzone_root()) {
+ engine->set_netzone_root(&piface_);
+ /* root netzone set, initialize models */
simgrid::s4u::Engine::on_platform_creation();
/* Initialize the surf models. That must be done after we got all config, and before we need the models.
- * That is, after the last <config> tag, if any, and before the first of cluster|peer|zone|trace|trace_connect
+ * That is, after the last <config> tag, if any, and before the first of cluster|peer|zone|trace|trace_cb
*
- * I'm not sure for <trace> and <trace_connect>, there may be a bug here
+ * I'm not sure for <trace> and <trace_cb>, there may be a bug here
* (FIXME: check it out by creating a file beginning with one of these tags)
* but cluster and peer come down to zone creations, so putting this verification here is correct.
*/
- surf_parse_models_setup_already_called = true;
surf_config_models_setup();
}
- xbt_assert(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name()),
+ xbt_assert(nullptr == engine->netpoint_by_name_or_null(get_name()),
"Refusing to create a second NetZone called '%s'.", get_cname());
netpoint_ = new NetPoint(name_, NetPoint::Type::NetZone);
- XBT_DEBUG("NetZone '%s' created with the id '%u'", get_cname(), netpoint_->id());
+ XBT_DEBUG("NetZone '%s' created with the id '%lu'", get_cname(), netpoint_->id());
+ _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent
+ * any further config now that we created some real content */
+ simgrid::s4u::NetZone::on_creation(piface_); // notify the signal
}
NetZoneImpl::~NetZoneImpl()
for (auto const& nz : children_)
delete nz;
- for (auto const& kv : bypass_routes_)
- delete kv.second;
+ /* Since hosts_ and links_ are a std::map, the hosts are destroyed in the lexicographic order, which ensures that the
+ * output is reproducible.
+ */
+ for (auto const& [_, host] : hosts_) {
+ host->destroy();
+ }
+ hosts_.clear();
+ for (auto const& [_, link] : links_) {
+ link->destroy();
+ }
+ links_.clear();
+
+ for (auto const& [_, route] : bypass_routes_)
+ delete route;
s4u::Engine::get_instance()->netpoint_unregister(netpoint_);
}
+xbt_node_t NetZoneImpl::new_xbt_graph_node(const s_xbt_graph_t* graph, const char* name,
+ std::map<std::string, xbt_node_t, std::less<>>* nodes)
+{
+ auto [elm, inserted] = nodes->try_emplace(name);
+ if (inserted)
+ elm->second = xbt_graph_new_node(graph, xbt_strdup(name));
+ return elm->second;
+}
+
+xbt_edge_t NetZoneImpl::new_xbt_graph_edge(const s_xbt_graph_t* graph, xbt_node_t src, xbt_node_t dst,
+ std::map<std::string, xbt_edge_t, std::less<>>* edges)
+{
+ const auto* src_name = static_cast<const char*>(xbt_graph_node_get_data(src));
+ const auto* dst_name = static_cast<const char*>(xbt_graph_node_get_data(dst));
+
+ auto elm = edges->find(std::string(src_name) + dst_name);
+ if (elm == edges->end()) {
+ bool inserted;
+ std::tie(elm, inserted) = edges->try_emplace(std::string(dst_name) + src_name);
+ if (inserted)
+ elm->second = xbt_graph_new_edge(graph, src, dst, nullptr);
+ }
+
+ return elm->second;
+}
+
void NetZoneImpl::add_child(NetZoneImpl* new_zone)
{
xbt_assert(not sealed_, "Cannot add a new child to the sealed zone %s", get_cname());
- /* set the father behavior */
+ /* set the parent behavior */
hierarchy_ = RoutingMode::recursive;
children_.push_back(new_zone);
}
*/
std::vector<s4u::Host*> NetZoneImpl::get_all_hosts() const
{
- std::vector<s4u::Host*> res;
- for (auto const& card : get_vertices()) {
- s4u::Host* host = s4u::Host::by_name_or_null(card->get_name());
- if (host != nullptr)
- res.push_back(host);
+ return s4u::Engine::get_instance()->get_filtered_hosts(
+ [this](const s4u::Host* host) { return host->get_impl()->get_englobing_zone() == this; });
+}
+size_t NetZoneImpl::get_host_count() const
+{
+ return get_all_hosts().size();
+}
+
+std::vector<s4u::Link*> NetZoneImpl::get_filtered_links(const std::function<bool(s4u::Link*)>& filter) const
+{
+ std::vector<s4u::Link*> filtered_list;
+ for (auto const& [_, link] : links_) {
+ s4u::Link* l = link->get_iface();
+ if (filter(l))
+ filtered_list.push_back(l);
+ }
+
+ for (const auto* child : children_) {
+ auto child_links = child->get_filtered_links(filter);
+ filtered_list.insert(filtered_list.end(), std::make_move_iterator(child_links.begin()),
+ std::make_move_iterator(child_links.end()));
}
- return res;
+ return filtered_list;
}
-int NetZoneImpl::get_host_count() const
+
+std::vector<s4u::Link*> NetZoneImpl::get_all_links() const
+{
+ return get_filtered_links([](const s4u::Link*) { return true; });
+}
+
+size_t NetZoneImpl::get_link_count() const
{
- int count = 0;
- for (auto const& card : get_vertices()) {
- const s4u::Host* host = s4u::Host::by_name_or_null(card->get_name());
- if (host != nullptr)
- count++;
+ size_t total = links_.size();
+ for (const auto* child : children_) {
+ total += child->get_link_count();
}
- return count;
+ return total;
}
s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector<double>& speed_per_pstate)
{
- auto* res = (new surf::HostImpl(name))->get_iface();
- res->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this));
+ xbt_assert(cpu_model_pm_,
+ "Impossible to create host: %s. Invalid CPU model: nullptr. Have you set the parent of this NetZone: %s?",
+ name.c_str(), get_cname());
+ xbt_assert(not sealed_, "Impossible to create host: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ auto* host = (new resource::HostImpl(name))->set_englobing_zone(this);
+ hosts_[name] = host;
+ host->get_iface()->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this));
- cpu_model_pm_->create_cpu(res, speed_per_pstate);
+ cpu_model_pm_->create_cpu(host->get_iface(), speed_per_pstate);
- return res;
+ return host->get_iface();
+}
+
+resource::StandardLinkImpl* NetZoneImpl::do_create_link(const std::string& name, const std::vector<double>& bandwidths)
+{
+ return network_model_->create_link(name, bandwidths);
}
s4u::Link* NetZoneImpl::create_link(const std::string& name, const std::vector<double>& bandwidths)
{
- return network_model_->create_link(name, bandwidths)->get_iface();
+ xbt_assert(
+ network_model_,
+ "Impossible to create link: %s. Invalid network model: nullptr. Have you set the parent of this NetZone: %s?",
+ name.c_str(), get_cname());
+ xbt_assert(not sealed_, "Impossible to create link: %s. NetZone %s already sealed", name.c_str(), get_cname());
+ links_[name] = do_create_link(name, bandwidths)->set_englobing_zone(this);
+ return links_[name]->get_iface();
+}
+
+s4u::SplitDuplexLink* NetZoneImpl::create_split_duplex_link(const std::string& name,
+ const std::vector<double>& bandwidths)
+{
+ xbt_assert(
+ network_model_,
+ "Impossible to create link: %s. Invalid network model: nullptr. Have you set the parent of this NetZone: %s?",
+ name.c_str(), get_cname());
+ xbt_assert(not sealed_, "Impossible to create link: %s. NetZone %s already sealed", name.c_str(), get_cname());
+
+ auto* link_up = create_link(name + "_UP", bandwidths)->get_impl()->set_englobing_zone(this);
+ auto* link_down = create_link(name + "_DOWN", bandwidths)->get_impl()->set_englobing_zone(this);
+ split_duplex_links_[name] = std::make_unique<resource::SplitDuplexLinkImpl>(name, link_up, link_down);
+ return split_duplex_links_[name]->get_iface();
}
s4u::Disk* NetZoneImpl::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
{
+ xbt_assert(disk_model_,
+ "Impossible to create disk: %s. Invalid disk model: nullptr. Have you set the parent of this NetZone: %s?",
+ name.c_str(), get_cname());
+ xbt_assert(not sealed_, "Impossible to create disk: %s. NetZone %s already sealed", name.c_str(), get_cname());
auto* l = disk_model_->create_disk(name, read_bandwidth, write_bandwidth);
return l->get_iface();
{
xbt_assert(nullptr == s4u::Engine::get_instance()->netpoint_by_name_or_null(name),
"Refusing to create a router named '%s': this name already describes a node.", name.c_str());
+ xbt_assert(not sealed_, "Impossible to create router: %s. NetZone %s already sealed", name.c_str(), get_cname());
return (new NetPoint(name, NetPoint::Type::Router))->set_englobing_zone(this);
}
-int NetZoneImpl::add_component(NetPoint* elm)
+
+unsigned long NetZoneImpl::add_component(NetPoint* elm)
{
vertices_.push_back(elm);
return vertices_.size() - 1; // The rank of the newly created object
}
+std::vector<resource::StandardLinkImpl*> NetZoneImpl::get_link_list_impl(const std::vector<s4u::LinkInRoute>& link_list,
+ bool backroute) const
+{
+ std::vector<resource::StandardLinkImpl*> links;
+
+ for (const auto& link : link_list) {
+ if (link.get_link()->get_sharing_policy() != s4u::Link::SharingPolicy::SPLITDUPLEX) {
+ links.push_back(link.get_link()->get_impl());
+ continue;
+ }
+ // split-duplex links
+ const auto* sd_link = dynamic_cast<const s4u::SplitDuplexLink*>(link.get_link());
+ xbt_assert(sd_link,
+ "Add_route: cast to SpliDuplexLink impossible. This should not happen, please contact SimGrid team");
+ resource::StandardLinkImpl* link_impl;
+ switch (link.get_direction()) {
+ case s4u::LinkInRoute::Direction::UP:
+ if (backroute)
+ link_impl = sd_link->get_link_down()->get_impl();
+ else
+ link_impl = sd_link->get_link_up()->get_impl();
+ break;
+ case s4u::LinkInRoute::Direction::DOWN:
+ if (backroute)
+ link_impl = sd_link->get_link_up()->get_impl();
+ else
+ link_impl = sd_link->get_link_down()->get_impl();
+ break;
+ default:
+ throw std::invalid_argument("Invalid add_route. Split-Duplex link without a direction: " +
+ link.get_link()->get_name());
+ }
+ links.push_back(link_impl);
+ }
+ return links;
+}
+
+resource::StandardLinkImpl* NetZoneImpl::get_link_by_name_or_null(const std::string& name) const
+{
+ if (auto link_it = links_.find(name); link_it != links_.end())
+ return link_it->second;
+
+ for (const auto* child : children_) {
+ if (auto* link = child->get_link_by_name_or_null(name))
+ return link;
+ }
+
+ return nullptr;
+}
+
+resource::SplitDuplexLinkImpl* NetZoneImpl::get_split_duplex_link_by_name_or_null(const std::string& name) const
+{
+ if (auto link_it = split_duplex_links_.find(name); link_it != split_duplex_links_.end())
+ return link_it->second.get();
+
+ for (const auto* child : children_) {
+ if (auto* link = child->get_split_duplex_link_by_name_or_null(name))
+ return link;
+ }
+
+ return nullptr;
+}
+
+resource::HostImpl* NetZoneImpl::get_host_by_name_or_null(const std::string& name) const
+{
+ for (auto const& [_, host] : hosts_) {
+ if (host->get_name() == name)
+ return host;
+ /* keep old behavior where host and VMs were saved together on EngineImpl::hosts_
+ * get hosts returns VMs too */
+ auto* vm = host->get_vm_by_name_or_null(name);
+ if (vm)
+ return vm;
+ }
+
+ for (const auto* child : children_) {
+ auto* host = child->get_host_by_name_or_null(name);
+ if (host)
+ return host;
+ }
+
+ return nullptr;
+}
+
+std::vector<s4u::Host*> NetZoneImpl::get_filtered_hosts(const std::function<bool(s4u::Host*)>& filter) const
+{
+ std::vector<s4u::Host*> filtered_list;
+ for (auto const& [_, host] : hosts_) {
+ s4u::Host* h = host->get_iface();
+ if (filter(h))
+ filtered_list.push_back(h);
+ /* Engine::get_hosts returns the VMs too */
+ for (auto* vm : h->get_impl()->get_vms()) {
+ if (filter(vm))
+ filtered_list.push_back(vm);
+ }
+ }
+
+ for (const auto* child : children_) {
+ auto child_links = child->get_filtered_hosts(filter);
+ filtered_list.insert(filtered_list.end(), std::make_move_iterator(child_links.begin()),
+ std::make_move_iterator(child_links.end()));
+ }
+ return filtered_list;
+}
+
void NetZoneImpl::add_route(NetPoint* /*src*/, NetPoint* /*dst*/, NetPoint* /*gw_src*/, NetPoint* /*gw_dst*/,
- const std::vector<resource::LinkImpl*>& /*link_list*/, bool /*symmetrical*/)
+ const std::vector<s4u::LinkInRoute>& /*link_list_*/, bool /*symmetrical*/)
{
xbt_die("NetZone '%s' does not accept new routes (wrong class).", get_cname());
}
void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- std::vector<resource::LinkImpl*>& link_list, bool /* symmetrical */)
+ const std::vector<s4u::LinkInRoute>& link_list)
{
/* Argument validity checks */
if (gw_dst) {
/* Build a copy that will be stored in the dict */
auto* newRoute = new BypassRoute(gw_src, gw_dst);
- for (auto const& link : link_list)
- newRoute->links.push_back(link);
+ auto converted_list = get_link_list_impl(link_list, false);
+ newRoute->links.insert(newRoute->links.end(), begin(converted_list), end(converted_list));
/* Store it */
- bypass_routes_.insert({{src, dst}, newRoute});
+ bypass_routes_.try_emplace({src, dst}, newRoute);
}
/** @brief Get the common ancestor and its first children in each line leading to src and dst
* dst
* @endverbatim
*/
-static void find_common_ancestors(NetPoint* src, NetPoint* dst,
+static void find_common_ancestors(const NetPoint* src, const NetPoint* dst,
/* OUT */ NetZoneImpl** common_ancestor, NetZoneImpl** src_ancestor,
NetZoneImpl** dst_ancestor)
{
current = current->get_parent();
}
- /* (3) find the common father.
+ /* (3) find the common parent.
* Before that, index_src and index_dst may be different, they both point to nullptr in path_src/path_dst
* So we move them down simultaneously as long as they point to the same content.
*
* This works because all SimGrid platform have a unique root element (that is the last element of both paths).
*/
- NetZoneImpl* father = nullptr; // the netzone we dropped on the previous loop iteration
- while (path_src.size() > 1 && path_dst.size() > 1 &&
- path_src.at(path_src.size() - 1) == path_dst.at(path_dst.size() - 1)) {
- father = path_src.at(path_src.size() - 1);
+ NetZoneImpl* parent = nullptr; // the netzone we dropped on the previous loop iteration
+ while (path_src.size() > 1 && path_dst.size() > 1 && path_src.back() == path_dst.back()) {
+ parent = path_src.back();
path_src.pop_back();
path_dst.pop_back();
}
/* (4) we found the difference at least. Finalize the returned values */
- *src_ancestor = path_src.at(path_src.size() - 1); /* the first different father of src */
- *dst_ancestor = path_dst.at(path_dst.size() - 1); /* the first different father of dst */
+ *src_ancestor = path_src.back(); /* the first different parent of src */
+ *dst_ancestor = path_dst.back(); /* the first different parent of dst */
if (*src_ancestor == *dst_ancestor) { // src is the ancestor of dst, or the contrary
*common_ancestor = *src_ancestor;
} else {
- *common_ancestor = father;
+ xbt_assert(parent != nullptr);
+ *common_ancestor = parent;
}
}
/* PRECONDITION: this is the common ancestor of src and dst */
-bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst,
- /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency)
+bool NetZoneImpl::get_bypass_route(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::StandardLinkImpl*>& links, double* latency,
+ std::unordered_set<NetZoneImpl*>& netzones)
{
// If never set a bypass route return nullptr without any further computations
if (bypass_routes_.empty())
if (dst->get_englobing_zone() == this && src->get_englobing_zone() == this) {
if (bypass_routes_.find({src, dst}) != bypass_routes_.end()) {
const BypassRoute* bypassedRoute = bypass_routes_.at({src, dst});
- for (resource::LinkImpl* const& link : bypassedRoute->links) {
- links.push_back(link);
- if (latency)
- *latency += link->get_latency();
- }
+ add_link_latency(links, bypassedRoute->links, latency);
XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->get_cname(), dst->get_cname(),
bypassedRoute->links.size());
return true;
current = current->parent_;
}
- /* (2) find the common father */
- while (path_src.size() > 1 && path_dst.size() > 1 &&
- path_src.at(path_src.size() - 1) == path_dst.at(path_dst.size() - 1)) {
+ /* (2) find the common parent */
+ while (path_src.size() > 1 && path_dst.size() > 1 && path_src.back() == path_dst.back()) {
path_src.pop_back();
path_dst.pop_back();
}
std::pair<kernel::routing::NetPoint*, kernel::routing::NetPoint*> key;
// Search for a bypass with the given indices. Returns true if found. Initialize variables `bypassedRoute' and `key'.
auto lookup = [&bypassedRoute, &key, &path_src, &path_dst, this](unsigned src_index, unsigned dst_index) {
- if (src_index < path_src.size() && dst_index <= path_dst.size()) {
+ if (src_index < path_src.size() && dst_index < path_dst.size()) {
key = {path_src[src_index]->netpoint_, path_dst[dst_index]->netpoint_};
auto bpr = bypass_routes_.find(key);
if (bpr != bypass_routes_.end()) {
"calls to getRoute",
src->get_cname(), dst->get_cname(), bypassedRoute->links.size());
if (src != key.first)
- get_global_route(src, bypassedRoute->gw_src, links, latency);
- for (resource::LinkImpl* const& link : bypassedRoute->links) {
- links.push_back(link);
- if (latency)
- *latency += link->get_latency();
- }
+ get_global_route_with_netzones(src, bypassedRoute->gw_src, links, latency, netzones);
+ add_link_latency(links, bypassedRoute->links, latency);
if (dst != key.second)
- get_global_route(bypassedRoute->gw_dst, dst, links, latency);
+ get_global_route_with_netzones(bypassedRoute->gw_dst, dst, links, latency, netzones);
return true;
}
XBT_DEBUG("No bypass route from '%s' to '%s'.", src->get_cname(), dst->get_cname());
return false;
}
-void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst,
- /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency)
+void NetZoneImpl::get_global_route(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::StandardLinkImpl*>& links, double* latency)
{
- RouteCreationArgs route;
+ std::unordered_set<NetZoneImpl*> netzones;
+ get_global_route_with_netzones(src, dst, links, latency, netzones);
+}
+
+void NetZoneImpl::get_global_route_with_netzones(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::StandardLinkImpl*>& links,
+ double* latency, std::unordered_set<NetZoneImpl*>& netzones)
+{
+ Route route;
XBT_DEBUG("Resolve route from '%s' to '%s'", src->get_cname(), dst->get_cname());
NetZoneImpl* src_ancestor;
NetZoneImpl* dst_ancestor;
find_common_ancestors(src, dst, &common_ancestor, &src_ancestor, &dst_ancestor);
- XBT_DEBUG("elements_father: common ancestor '%s' src ancestor '%s' dst ancestor '%s'", common_ancestor->get_cname(),
- src_ancestor->get_cname(), dst_ancestor->get_cname());
+ XBT_DEBUG("find_common_ancestors: common ancestor '%s' src ancestor '%s' dst ancestor '%s'",
+ common_ancestor->get_cname(), src_ancestor->get_cname(), dst_ancestor->get_cname());
+ netzones.insert(src->get_englobing_zone());
+ netzones.insert(dst->get_englobing_zone());
+ netzones.insert(common_ancestor);
/* Check whether a direct bypass is defined. If so, use it and bail out */
- if (common_ancestor->get_bypass_route(src, dst, links, latency))
+ if (common_ancestor->get_bypass_route(src, dst, links, latency, netzones))
return;
/* If src and dst are in the same netzone, life is good */
if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */
- route.link_list = std::move(links);
+ route.link_list_ = std::move(links);
common_ancestor->get_local_route(src, dst, &route, latency);
- links = std::move(route.link_list);
+ links = std::move(route.link_list_);
return;
}
/* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */
-
common_ancestor->get_local_route(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
- xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "Bad gateways for route from '%s' to '%s'.",
+ xbt_assert((route.gw_src_ != nullptr) && (route.gw_dst_ != nullptr), "Bad gateways for route from '%s' to '%s'.",
src->get_cname(), dst->get_cname());
/* If source gateway is not our source, we have to recursively find our way up to this point */
- if (src != route.gw_src)
- get_global_route(src, route.gw_src, links, latency);
- links.insert(links.end(), begin(route.link_list), end(route.link_list));
+ if (src != route.gw_src_)
+ get_global_route_with_netzones(src, route.gw_src_, links, latency, netzones);
+ links.insert(links.end(), begin(route.link_list_), end(route.link_list_));
/* If dest gateway is not our destination, we have to recursively find our way from this point */
- if (route.gw_dst != dst)
- get_global_route(route.gw_dst, dst, links, latency);
+ if (route.gw_dst_ != dst)
+ get_global_route_with_netzones(route.gw_dst_, dst, links, latency, netzones);
}
void NetZoneImpl::seal()
for (auto* host : get_all_hosts()) {
host->seal();
}
+
+ /* sealing links */
+ for (auto const& [_, link] : links_)
+ link->get_iface()->seal();
+
for (auto* sub_net : get_children()) {
sub_net->seal();
}
sealed_ = true;
+ s4u::NetZone::on_seal(piface_);
}
void NetZoneImpl::set_parent(NetZoneImpl* parent)
disk_model_ = std::move(disk_model);
}
-void NetZoneImpl::set_host_model(std::shared_ptr<surf::HostModel> host_model)
+void NetZoneImpl::set_host_model(std::shared_ptr<resource::HostModel> host_model)
{
xbt_assert(not sealed_, "Impossible to set host model to an already sealed NetZone(%s)", this->get_cname());
host_model_ = std::move(host_model);
}
-} // namespace routing
-} // namespace kernel
-} // namespace simgrid
+const NetZoneImpl* NetZoneImpl::get_netzone_recursive(const NetPoint* netpoint) const
+{
+ xbt_assert(netpoint && netpoint->is_netzone(), "Netpoint %s must be of the type NetZone",
+ netpoint ? netpoint->get_cname() : "nullptr");
+
+ if (netpoint == netpoint_)
+ return this;
+
+ for (const auto* children : children_) {
+ const NetZoneImpl* netzone = children->get_netzone_recursive(netpoint);
+ if (netzone)
+ return netzone;
+ }
+ return nullptr;
+}
+
+bool NetZoneImpl::is_component_recursive(const NetPoint* netpoint) const
+{
+ /* check direct components */
+ if (std::any_of(begin(vertices_), end(vertices_), [netpoint](const auto* elem) { return elem == netpoint; }))
+ return true;
+
+ /* check childrens */
+ return std::any_of(begin(children_), end(children_),
+ [netpoint](const auto* child) { return child->is_component_recursive(netpoint); });
+}
+} // namespace simgrid::kernel::routing