-/* Copyright (c) 2009-2019. 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/FullZone.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp"
-#include "surf/surf.hpp"
+#include <simgrid/kernel/routing/FullZone.hpp>
+#include <simgrid/kernel/routing/NetPoint.hpp>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
+#include "src/kernel/resource/StandardLinkImpl.hpp"
-#define TO_ROUTE_FULL(i, j) routing_table_[(i) + (j)*table_size]
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
namespace simgrid {
namespace kernel {
namespace routing {
-FullZone::FullZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
- : RoutedZone(father, name, netmodel)
-{
-}
-void FullZone::seal()
+void FullZone::check_routing_table()
{
unsigned int table_size = get_table_size();
-
- /* Create table if needed */
- if (not routing_table_)
- routing_table_ = new RouteCreationArgs*[table_size * table_size]();
-
- /* Add the loopback if needed */
- if (network_model_->loopback_ && hierarchy_ == RoutingMode::base) {
- for (unsigned int i = 0; i < table_size; i++) {
- RouteCreationArgs* route = TO_ROUTE_FULL(i, i);
- if (not route) {
- route = new RouteCreationArgs();
- route->link_list.push_back(network_model_->loopback_);
- TO_ROUTE_FULL(i, i) = route;
- }
+ /* assure routing_table is table_size X table_size */
+ if (routing_table_.size() != table_size) {
+ routing_table_.resize(table_size);
+ for (auto& j : routing_table_) {
+ j.resize(table_size);
}
}
}
-FullZone::~FullZone()
+void FullZone::do_seal()
{
- if (routing_table_) {
- unsigned int table_size = get_table_size();
- /* Delete routing table */
- for (unsigned int i = 0; i < table_size; i++)
- for (unsigned int j = 0; j < table_size; j++)
- delete TO_ROUTE_FULL(i, j);
- delete[] routing_table_;
+ check_routing_table();
+ /* Add the loopback if needed */
+ if (get_network_model()->loopback_ && get_hierarchy() == RoutingMode::base) {
+ for (unsigned int i = 0; i < get_table_size(); i++) {
+ auto& route = routing_table_[i][i];
+ if (not route) {
+ route.reset(new Route());
+ route->link_list_.push_back(get_network_model()->loopback_);
+ }
+ }
}
}
-void FullZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* res, double* lat)
+void FullZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* res, double* lat)
{
- XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
+ XBT_DEBUG("full getLocalRoute from %s[%lu] to %s[%lu]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
- unsigned int table_size = get_table_size();
- RouteCreationArgs* e_route = TO_ROUTE_FULL(src->id(), dst->id());
+ const auto& e_route = routing_table_[src->id()][dst->id()];
if (e_route != nullptr) {
- res->gw_src = e_route->gw_src;
- res->gw_dst = e_route->gw_dst;
- for (auto const& link : e_route->link_list) {
- res->link_list.push_back(link);
- if (lat)
- *lat += link->get_latency();
- }
+ res->gw_src_ = e_route->gw_src_;
+ res->gw_dst_ = e_route->gw_dst_;
+ add_link_latency(res->link_list_, e_route->link_list_, lat);
}
}
void FullZone::add_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, bool symmetrical)
{
add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
- unsigned int table_size = get_table_size();
-
- if (not routing_table_)
- routing_table_ = new RouteCreationArgs*[table_size * table_size]();
+ check_routing_table();
/* Check that the route does not already exist */
- if (gw_dst) // inter-zone route (to adapt the error message, if any)
- xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()),
+ if (gw_dst && gw_src) // inter-zone route (to adapt the error message, if any)
+ xbt_assert(nullptr == routing_table_[src->id()][dst->id()],
"The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).",
src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname());
else
- xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()),
+ xbt_assert(nullptr == routing_table_[src->id()][dst->id()],
"The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->get_cname(),
dst->get_cname());
/* Add the route to the base */
- TO_ROUTE_FULL(src->id(), dst->id()) =
- new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, true);
+ routing_table_[src->id()][dst->id()] = std::unique_ptr<Route>(
+ new_extended_route(get_hierarchy(), gw_src, gw_dst, get_link_list_impl(link_list, false), true));
- if (symmetrical == true && src != dst) {
+ if (symmetrical && src != dst) {
if (gw_dst && gw_src) {
NetPoint* gw_tmp = gw_src;
gw_src = gw_dst;
}
if (gw_dst && gw_src) // inter-zone route (to adapt the error message, if any)
xbt_assert(
- nullptr == TO_ROUTE_FULL(dst->id(), src->id()),
+ nullptr == routing_table_[dst->id()][src->id()],
"The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.",
dst->get_cname(), gw_dst->get_cname(), src->get_cname(), gw_src->get_cname());
else
- xbt_assert(nullptr == TO_ROUTE_FULL(dst->id(), src->id()),
+ xbt_assert(nullptr == routing_table_[dst->id()][src->id()],
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->get_cname(), src->get_cname());
- TO_ROUTE_FULL(dst->id(), src->id()) =
- new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, false);
+ routing_table_[dst->id()][src->id()] = std::unique_ptr<Route>(
+ new_extended_route(get_hierarchy(), gw_src, gw_dst, get_link_list_impl(link_list, true), false));
}
}
+} // namespace routing
+} // namespace kernel
+
+namespace s4u {
+NetZone* create_full_zone(const std::string& name)
+{
+ return (new kernel::routing::FullZone(name))->get_iface();
}
-}
-} // namespace
+} // namespace s4u
+
+} // namespace simgrid
