-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2021. 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 "src/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "src/include/simgrid/sg_config.hpp"
+#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/DiskImpl.hpp"
+#include "src/surf/HostImpl.hpp"
+#include "src/surf/SplitDuplexLinkImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-
-#include "xbt/log.h"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route);
namespace kernel {
namespace routing {
-class BypassRoute {
-public:
- explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
- NetPoint* gw_src;
- NetPoint* gw_dst;
- std::vector<surf::LinkImpl*> links;
-};
+/* Pick the right models for CPU, net and host, and call their model_init_preparse */
+static void surf_config_models_setup()
+{
+ std::string host_model_name = simgrid::config::get_value<std::string>("host/model");
+ std::string network_model_name = simgrid::config::get_value<std::string>("network/model");
+ std::string cpu_model_name = simgrid::config::get_value<std::string>("cpu/model");
+ std::string disk_model_name = simgrid::config::get_value<std::string>("disk/model");
+
+ /* The compound host model is needed when using non-default net/cpu models */
+ if ((not simgrid::config::is_default("network/model") || not simgrid::config::is_default("cpu/model")) &&
+ simgrid::config::is_default("host/model")) {
+ host_model_name = "compound";
+ simgrid::config::set_value("host/model", host_model_name);
+ }
+
+ XBT_DEBUG("host model: %s", host_model_name.c_str());
+ if (host_model_name == "compound") {
+ 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");
+
+ const auto* cpu_model = find_model_description(surf_cpu_model_description, cpu_model_name);
+ cpu_model->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");
+ 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
+ * requires changing the declaration of surf_cpu_model_description.
+ * To be reviewed in the future */
+ surf_vm_model_init_HL13(
+ simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->get_cpu_pm_model().get());
+
+ XBT_DEBUG("Call disk_model_init");
+ const auto* disk_model = find_model_description(surf_disk_model_description, disk_model_name);
+ disk_model->model_init_preparse();
+}
-NetZoneImpl::NetZoneImpl(NetZone* father, const char* name) : NetZone(father, name)
+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::LinkImpl*> const& link_list)>
+ NetZoneImpl::on_route_creation;
+
+NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name)
{
- xbt_assert(nullptr == simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name),
- "Refusing to create a second NetZone called '%s'.", name);
+ /* 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_);
+ /* 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
+ *
+ * I'm not sure for <trace> and <trace_connect>, 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_config_models_setup();
+ }
- netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast<NetZoneImpl*>(father));
- XBT_DEBUG("NetZone '%s' created with the id '%d'", name, netpoint_->id());
+ xbt_assert(nullptr == s4u::Engine::get_instance()->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());
+ _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& kv : bypassRoutes_)
+ for (auto const& nz : children_)
+ delete nz;
+
+ for (auto const& kv : bypass_routes_)
delete kv.second;
- simgrid::s4u::Engine::getInstance()->netpointUnregister(netpoint_);
+ s4u::Engine::get_instance()->netpoint_unregister(netpoint_);
}
-simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
- std::unordered_map<std::string, std::string>* props)
+void NetZoneImpl::add_child(NetZoneImpl* new_zone)
{
- simgrid::s4u::Host* res = new simgrid::s4u::Host(name);
+ xbt_assert(not sealed_, "Cannot add a new child to the sealed zone %s", get_cname());
+ /* set the parent behavior */
+ hierarchy_ = RoutingMode::recursive;
+ children_.push_back(new_zone);
+}
- if (hierarchy_ == RoutingMode::unset)
- hierarchy_ = RoutingMode::base;
+/** @brief Returns the list of the hosts found in this NetZone (not recursively)
+ *
+ * Only the hosts that are directly contained in this NetZone are retrieved,
+ * not the ones contained in sub-netzones.
+ */
+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 res;
+}
+int NetZoneImpl::get_host_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++;
+ }
+ return count;
+}
- res->pimpl_netpoint = new NetPoint(name, NetPoint::Type::Host, this);
+s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector<double>& speed_per_pstate)
+{
+ 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());
+ auto* res = (new surf::HostImpl(name))->get_iface();
+ res->set_netpoint((new NetPoint(name, NetPoint::Type::Host))->set_englobing_zone(this));
- surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
+ cpu_model_pm_->create_cpu(res, speed_per_pstate);
- if (props != nullptr)
- for (auto kv : *props)
- res->setProperty(kv.first.c_str(), kv.second.c_str());
+ return res;
+}
- simgrid::s4u::Host::onCreation(*res); // notify the signal
+s4u::Link* NetZoneImpl::create_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());
+ return network_model_->create_link(name, bandwidths)->get_iface();
+}
- return res;
+s4u::SplitDuplexLink* NetZoneImpl::create_split_duplex_link(const std::string& name,
+ const std::vector<double>& bandwidths)
+{
+ auto* link_up = network_model_->create_link(name + "_UP", bandwidths);
+ auto* link_down = network_model_->create_link(name + "_DOWN", bandwidths);
+ auto link = std::make_unique<resource::SplitDuplexLinkImpl>(name, link_up, link_down);
+ auto* link_iface = link->get_iface();
+ EngineImpl::get_instance()->add_split_duplex_link(name, std::move(link));
+ return link_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());
+ auto* l = disk_model_->create_disk(name, read_bandwidth, write_bandwidth);
+
+ return l->get_iface();
+}
+
+NetPoint* NetZoneImpl::create_router(const std::string& name)
+{
+ 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());
+
+ return (new NetPoint(name, NetPoint::Type::Router))->set_englobing_zone(this);
+}
+int NetZoneImpl::add_component(NetPoint* elm)
+{
+ vertices_.push_back(elm);
+ return vertices_.size() - 1; // The rank of the newly created object
+}
+
+std::vector<resource::LinkImpl*> NetZoneImpl::get_link_list_impl(const std::vector<s4u::LinkInRoute>& link_list,
+ bool backroute) const
+{
+ std::vector<resource::LinkImpl*> 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::LinkImpl* 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;
+}
+
+void NetZoneImpl::add_route(NetPoint* /*src*/, NetPoint* /*dst*/, NetPoint* /*gw_src*/, NetPoint* /*gw_dst*/,
+ const std::vector<s4u::LinkInRoute>& /*link_list_*/, bool /*symmetrical*/)
+{
+ xbt_die("NetZone '%s' does not accept new routes (wrong class).", get_cname());
}
-void NetZoneImpl::addBypassRoute(sg_platf_route_cbarg_t e_route)
+void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+ const std::vector<s4u::LinkInRoute>& link_list)
{
/* Argument validity checks */
- if (e_route->gw_dst) {
- XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", e_route->src->cname(), e_route->gw_src->cname(),
- e_route->dst->cname(), e_route->gw_dst->cname());
- xbt_assert(not e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
- e_route->src->cname(), e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname());
- xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(),
- "The bypass route between %s@%s and %s@%s already exists.", e_route->src->cname(),
- e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname());
+ if (gw_dst) {
+ XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", src->get_cname(), gw_src->get_cname(), dst->get_cname(),
+ gw_dst->get_cname());
+ xbt_assert(not link_list.empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", src->get_cname(),
+ gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname());
+ xbt_assert(bypass_routes_.find({src, dst}) == bypass_routes_.end(),
+ "The bypass route between %s@%s and %s@%s already exists.", src->get_cname(), gw_src->get_cname(),
+ dst->get_cname(), gw_dst->get_cname());
} else {
- XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->cname(), e_route->dst->cname());
- xbt_assert(not e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.",
- e_route->src->cname(), e_route->dst->cname());
- xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(),
- "The bypass route between %s and %s already exists.", e_route->src->cname(), e_route->dst->cname());
+ XBT_DEBUG("Load bypassRoute from %s to %s", src->get_cname(), dst->get_cname());
+ xbt_assert(not link_list.empty(), "Bypass route between %s and %s cannot be empty.", src->get_cname(),
+ dst->get_cname());
+ xbt_assert(bypass_routes_.find({src, dst}) == bypass_routes_.end(),
+ "The bypass route between %s and %s already exists.", src->get_cname(), dst->get_cname());
}
/* Build a copy that will be stored in the dict */
- kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(e_route->gw_src, e_route->gw_dst);
- for (auto link : *e_route->link_list)
- newRoute->links.push_back(link);
+ auto* newRoute = new BypassRoute(gw_src, gw_dst);
+ auto converted_list = get_link_list_impl(link_list, false);
+ newRoute->links.insert(newRoute->links.end(), begin(converted_list), end(converted_list));
/* Store it */
- bypassRoutes_.insert({{e_route->src, e_route->dst}, newRoute});
+ bypass_routes_.insert({{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)
{
/* Deal with the easy base case */
- if (src->netzone() == dst->netzone()) {
- *common_ancestor = src->netzone();
+ if (src->get_englobing_zone() == dst->get_englobing_zone()) {
+ *common_ancestor = src->get_englobing_zone();
*src_ancestor = *common_ancestor;
*dst_ancestor = *common_ancestor;
return;
/* engage the full recursive search */
/* (1) find the path to root of src and dst*/
- NetZoneImpl* src_as = src->netzone();
- NetZoneImpl* dst_as = dst->netzone();
+ const NetZoneImpl* src_as = src->get_englobing_zone();
+ const NetZoneImpl* dst_as = dst->get_englobing_zone();
- xbt_assert(src_as, "Host %s must be in a netzone", src->cname());
- xbt_assert(dst_as, "Host %s must be in a netzone", dst->cname());
+ xbt_assert(src_as, "Host %s must be in a netzone", src->get_cname());
+ xbt_assert(dst_as, "Host %s must be in a netzone", dst->get_cname());
/* (2) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
- NetZoneImpl* current = src->netzone();
+ NetZoneImpl* current = src->get_englobing_zone();
while (current != nullptr) {
path_src.push_back(current);
- current = static_cast<NetZoneImpl*>(current->getFather());
+ current = current->get_parent();
}
std::vector<NetZoneImpl*> path_dst;
- current = dst->netzone();
+ current = dst->get_englobing_zone();
while (current != nullptr) {
path_dst.push_back(current);
- current = static_cast<NetZoneImpl*>(current->getFather());
+ 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::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst,
- /* OUT */ std::vector<surf::LinkImpl*>* links, double* latency)
+bool NetZoneImpl::get_bypass_route(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency,
+ std::unordered_set<NetZoneImpl*>& netzones)
{
// If never set a bypass route return nullptr without any further computations
- if (bypassRoutes_.empty())
+ if (bypass_routes_.empty())
return false;
/* Base case, no recursion is needed */
- if (dst->netzone() == this && src->netzone() == this) {
- if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
- BypassRoute* bypassedRoute = bypassRoutes_.at({src, dst});
- for (surf::LinkImpl* link : bypassedRoute->links) {
- links->push_back(link);
- if (latency)
- *latency += link->latency();
- }
- XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->cname(), dst->cname(),
+ 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});
+ 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;
}
/* (1) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
- NetZone* current = src->netzone();
+ NetZoneImpl* current = src->get_englobing_zone();
while (current != nullptr) {
- path_src.push_back(static_cast<NetZoneImpl*>(current));
- current = current->father_;
+ path_src.push_back(current);
+ current = current->parent_;
}
std::vector<NetZoneImpl*> path_dst;
- current = dst->netzone();
+ current = dst->get_englobing_zone();
while (current != nullptr) {
- path_dst.push_back(static_cast<NetZoneImpl*>(current));
- current = current->father_;
+ path_dst.push_back(current);
+ 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();
}
- int max_index_src = path_src.size() - 1;
- int max_index_dst = path_dst.size() - 1;
-
- int max_index = std::max(max_index_src, max_index_dst);
-
/* (3) Search for a bypass making the path up to the ancestor useless */
- BypassRoute* bypassedRoute = nullptr;
+ const BypassRoute* bypassedRoute = nullptr;
std::pair<kernel::routing::NetPoint*, kernel::routing::NetPoint*> key;
- for (int max = 0; max <= max_index; max++) {
- for (int i = 0; i < max; i++) {
- if (i <= max_index_src && max <= max_index_dst) {
- key = {path_src.at(i)->netpoint_, path_dst.at(max)->netpoint_};
- if (bypassRoutes_.find(key) != bypassRoutes_.end()) {
- bypassedRoute = bypassRoutes_.at(key);
- break;
- }
- }
- if (max <= max_index_src && i <= max_index_dst) {
- key = {path_src.at(max)->netpoint_, path_dst.at(i)->netpoint_};
- if (bypassRoutes_.find(key) != bypassRoutes_.end()) {
- bypassedRoute = bypassRoutes_.at(key);
- break;
- }
+ // 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()) {
+ key = {path_src[src_index]->netpoint_, path_dst[dst_index]->netpoint_};
+ auto bpr = bypass_routes_.find(key);
+ if (bpr != bypass_routes_.end()) {
+ bypassedRoute = bpr->second;
+ return true;
}
}
+ return false;
+ };
- if (bypassedRoute)
- break;
-
- if (max <= max_index_src && max <= max_index_dst) {
- key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_};
- if (bypassRoutes_.find(key) != bypassRoutes_.end()) {
- bypassedRoute = bypassRoutes_.at(key);
+ for (unsigned max = 0, max_index = std::max(path_src.size(), path_dst.size()); max < max_index; max++) {
+ for (unsigned i = 0; i < max; i++) {
+ if (lookup(i, max) || lookup(max, i))
break;
- }
}
+ if (bypassedRoute || lookup(max, max))
+ break;
}
/* (4) If we have the bypass, use it. If not, caller will do the Right Thing. */
if (bypassedRoute) {
XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links. We may have to complete it with recursive "
"calls to getRoute",
- src->cname(), dst->cname(), bypassedRoute->links.size());
+ src->get_cname(), dst->get_cname(), bypassedRoute->links.size());
if (src != key.first)
- getGlobalRoute(src, bypassedRoute->gw_src, links, latency);
- for (surf::LinkImpl* link : bypassedRoute->links) {
- links->push_back(link);
- if (latency)
- *latency += link->latency();
- }
+ get_global_route_with_netzones(src, bypassedRoute->gw_src, links, latency, netzones);
+ add_link_latency(links, bypassedRoute->links, latency);
if (dst != key.second)
- getGlobalRoute(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->cname(), dst->cname());
+ XBT_DEBUG("No bypass route from '%s' to '%s'.", src->get_cname(), dst->get_cname());
return false;
}
-void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst,
- /* OUT */ std::vector<surf::LinkImpl*>* links, double* latency)
+void NetZoneImpl::get_global_route(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency)
{
- s_sg_platf_route_cbarg_t route;
- memset(&route, 0, sizeof(route));
+ std::unordered_set<NetZoneImpl*> netzones;
+ get_global_route_with_netzones(src, dst, links, latency, netzones);
+}
- XBT_DEBUG("Resolve route from '%s' to '%s'", src->cname(), dst->cname());
+void NetZoneImpl::get_global_route_with_netzones(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency,
+ std::unordered_set<NetZoneImpl*>& netzones)
+{
+ Route route;
+
+ XBT_DEBUG("Resolve route from '%s' to '%s'", src->get_cname(), dst->get_cname());
/* Find how src and dst are interconnected */
- NetZoneImpl *common_ancestor;
- NetZoneImpl *src_ancestor;
- NetZoneImpl *dst_ancestor;
+ NetZoneImpl* common_ancestor;
+ 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->getCname(),
- src_ancestor->getCname(), dst_ancestor->getCname());
+ 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->getBypassRoute(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 = links;
- common_ancestor->getLocalRoute(src, dst, &route, latency);
+ route.link_list_ = std::move(links);
+ common_ancestor->get_local_route(src, dst, &route, latency);
+ 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 */
-
- route.link_list = new std::vector<surf::LinkImpl*>();
-
- common_ancestor->getLocalRoute(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\"",
- src->cname(), dst->cname());
+ 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'.",
+ 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)
- getGlobalRoute(src, route.gw_src, links, latency);
- for (auto link : *route.link_list)
- links->push_back(link);
- delete 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)
- getGlobalRoute(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()
+{
+ /* already sealed netzone */
+ if (sealed_)
+ return;
+ do_seal(); // derived class' specific sealing procedure
+
+ /* seals sub-netzones and hosts */
+ for (auto* host : get_all_hosts()) {
+ host->seal();
+ }
+ for (auto* sub_net : get_children()) {
+ sub_net->seal();
+ }
+ sealed_ = true;
+ s4u::NetZone::on_seal(piface_);
}
+
+void NetZoneImpl::set_parent(NetZoneImpl* parent)
+{
+ xbt_assert(not sealed_, "Impossible to set parent to an already sealed NetZone(%s)", this->get_cname());
+ parent_ = parent;
+ netpoint_->set_englobing_zone(parent_);
+ if (parent) {
+ /* adding this class as child */
+ parent->add_child(this);
+ /* copying models from parent host, to be reviewed when we allow multi-models */
+ set_network_model(parent->get_network_model());
+ set_cpu_pm_model(parent->get_cpu_pm_model());
+ set_cpu_vm_model(parent->get_cpu_vm_model());
+ set_disk_model(parent->get_disk_model());
+ set_host_model(parent->get_host_model());
+ }
+}
+
+void NetZoneImpl::set_network_model(std::shared_ptr<resource::NetworkModel> netmodel)
+{
+ xbt_assert(not sealed_, "Impossible to set network model to an already sealed NetZone(%s)", this->get_cname());
+ network_model_ = std::move(netmodel);
+}
+
+void NetZoneImpl::set_cpu_vm_model(std::shared_ptr<resource::CpuModel> cpu_model)
+{
+ xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname());
+ cpu_model_vm_ = std::move(cpu_model);
+}
+
+void NetZoneImpl::set_cpu_pm_model(std::shared_ptr<resource::CpuModel> cpu_model)
+{
+ xbt_assert(not sealed_, "Impossible to set CPU model to an already sealed NetZone(%s)", this->get_cname());
+ cpu_model_pm_ = std::move(cpu_model);
+}
+
+void NetZoneImpl::set_disk_model(std::shared_ptr<resource::DiskModel> disk_model)
+{
+ xbt_assert(not sealed_, "Impossible to set disk model to an already sealed NetZone(%s)", this->get_cname());
+ disk_model_ = std::move(disk_model);
+}
+
+void NetZoneImpl::set_host_model(std::shared_ptr<surf::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);
+}
+
+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
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid