X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1da7f2f81ac83f93922fb824750f174c1eb4bce5..b10fe350b15bbc86b84dd18cf467d9dd4870d5cc:/src/kernel/routing/NetZoneImpl.cpp diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp index 036051f9f8..af20d26f62 100644 --- a/src/kernel/routing/NetZoneImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -11,9 +11,9 @@ #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 "src/surf/xml/platf_private.hpp" #include "surf/surf.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route); @@ -42,16 +42,16 @@ 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 @@ -61,10 +61,15 @@ static void surf_config_models_setup() 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 const& link_list)> + NetZoneImpl::on_route_creation; + NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(name) { /* workaroud: first netzoneImpl will be the root netzone. @@ -90,6 +95,9 @@ NetZoneImpl::NetZoneImpl(const std::string& name) : piface_(this), name_(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() @@ -106,7 +114,7 @@ NetZoneImpl::~NetZoneImpl() 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); } @@ -139,6 +147,9 @@ int NetZoneImpl::get_host_count() const s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& 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)); @@ -149,11 +160,29 @@ s4u::Host* NetZoneImpl::create_host(const std::string& name, const std::vector& 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(); } +s4u::SplitDuplexLink* NetZoneImpl::create_split_duplex_link(const std::string& name, + const std::vector& 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(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(); @@ -172,14 +201,51 @@ int NetZoneImpl::add_component(NetPoint* elm) return vertices_.size() - 1; // The rank of the newly created object } +std::vector NetZoneImpl::get_link_list_impl(const std::vector& link_list, + bool backroute) const +{ + std::vector 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(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& /*link_list*/, bool /*symmetrical*/) + const std::vector& /*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& link_list, bool /* symmetrical */) + const std::vector& link_list) { /* Argument validity checks */ if (gw_dst) { @@ -200,8 +266,8 @@ void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_sr /* 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}); @@ -257,7 +323,7 @@ void NetZoneImpl::add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_sr * 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) { @@ -292,33 +358,34 @@ static void find_common_ancestors(NetPoint* src, NetPoint* dst, 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& links, double* latency) +bool NetZoneImpl::get_bypass_route(const NetPoint* src, const NetPoint* dst, + /* OUT */ std::vector& links, double* latency, + std::unordered_set& netzones) { // If never set a bypass route return nullptr without any further computations if (bypass_routes_.empty()) @@ -328,11 +395,7 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, 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; @@ -357,9 +420,8 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, 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(); } @@ -395,24 +457,28 @@ bool NetZoneImpl::get_bypass_route(NetPoint* src, NetPoint* dst, "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, +void NetZoneImpl::get_global_route(const NetPoint* src, const NetPoint* dst, /* OUT */ std::vector& links, double* latency) { - RouteCreationArgs route; + std::unordered_set 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& links, double* latency, + std::unordered_set& netzones) +{ + Route route; XBT_DEBUG("Resolve route from '%s' to '%s'", src->get_cname(), dst->get_cname()); @@ -421,35 +487,37 @@ void NetZoneImpl::get_global_route(NetPoint* src, NetPoint* dst, 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(), + XBT_DEBUG("%s: common ancestor '%s' src ancestor '%s' dst ancestor '%s'", __func__, 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() @@ -517,6 +585,32 @@ void NetZoneImpl::set_host_model(std::shared_ptr host_model) 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 routing } // namespace kernel } // namespace simgrid