-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "surf/surf.hpp"
+#include "xbt/string.hpp"
#include <cfloat>
#include <limits>
namespace kernel {
namespace routing {
-FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name)
-{
- predecessor_table_ = nullptr;
- cost_table_ = nullptr;
- link_table_ = nullptr;
-}
-
FloydZone::~FloydZone()
{
- if (link_table_ == nullptr) // Dealing with a parse error in the file?
- return;
- unsigned int table_size = get_table_size();
/* Delete link_table */
- for (unsigned int i = 0; i < table_size; i++)
- for (unsigned int j = 0; j < table_size; j++)
- delete TO_FLOYD_LINK(i, j);
- delete[] link_table_;
+ for (auto const* link : link_table_)
+ delete link;
+}
- delete[] predecessor_table_;
- delete[] cost_table_;
+void FloydZone::init_tables(unsigned int table_size)
+{
+ if (link_table_.empty()) {
+ /* Create and initialize Cost, Predecessor and Link tables */
+ cost_table_.resize(table_size * table_size, DBL_MAX); /* link cost from host to host */
+ predecessor_table_.resize(table_size * table_size, -1); /* predecessor host numbers */
+ link_table_.resize(table_size * table_size, nullptr); /* actual link between src and dst */
+ }
}
void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
{
unsigned int table_size = get_table_size();
- getRouteCheckParams(src, dst);
+ get_route_check_params(src, dst);
/* create a result route */
std::vector<RouteCreationArgs*> route_stack;
do {
int pred = TO_FLOYD_PRED(src->id(), cur);
if (pred == -1)
- THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname());
+ throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname()));
route_stack.push_back(TO_FLOYD_LINK(pred, cur));
cur = pred;
} while (cur != src->id());
- if (hierarchy_ == RoutingMode::recursive) {
+ if (get_hierarchy() == RoutingMode::recursive) {
route->gw_src = route_stack.back()->gw_src;
route->gw_dst = route_stack.front()->gw_dst;
}
NetPoint* prev_dst_gw = nullptr;
while (not route_stack.empty()) {
- RouteCreationArgs* e_route = route_stack.back();
+ const RouteCreationArgs* e_route = route_stack.back();
route_stack.pop_back();
- if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr &&
+ if (get_hierarchy() == RoutingMode::recursive && prev_dst_gw != nullptr &&
prev_dst_gw->get_cname() != e_route->gw_src->get_cname()) {
get_global_route(prev_dst_gw, e_route->gw_src, route->link_list, lat);
}
}
void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
- std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
+ const std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
/* set the size of table routing */
unsigned int table_size = get_table_size();
+ init_tables(table_size);
- addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
-
- if (not link_table_) {
- /* Create Cost, Predecessor and Link tables */
- cost_table_ = new double[table_size * table_size]; /* link cost from host to host */
- predecessor_table_ = new int[table_size * table_size]; /* predecessor host numbers */
- link_table_ = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */
-
- /* Initialize costs and predecessors */
- for (unsigned int i = 0; i < table_size; i++)
- for (unsigned int j = 0; j < table_size; j++) {
- TO_FLOYD_COST(i, j) = DBL_MAX;
- TO_FLOYD_PRED(i, j) = -1;
- TO_FLOYD_LINK(i, j) = nullptr;
- }
- }
+ add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
/* Check that the route does not already exist */
- if (gw_dst) // netzone route (to adapt the error message, if any)
+ if (gw_dst && gw_src) // netzone route (to adapt the error message, if any)
xbt_assert(nullptr == TO_FLOYD_LINK(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());
"The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->get_cname(),
dst->get_cname());
- TO_FLOYD_LINK(src->id(), dst->id()) =
- newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
+ TO_FLOYD_LINK(src->id(), dst->id()) = new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list, true);
TO_FLOYD_PRED(src->id(), dst->id()) = src->id();
TO_FLOYD_COST(src->id(), dst->id()) = (TO_FLOYD_LINK(src->id(), dst->id()))->link_list.size();
- if (symmetrical == true) {
- if (gw_dst) // netzone route (to adapt the error message, if any)
+ if (symmetrical) {
+ if (gw_dst && gw_src) // netzone route (to adapt the error message, if any)
xbt_assert(
nullptr == TO_FLOYD_LINK(dst->id(), src->id()),
"The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.",
XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->get_cname(), gw_src->get_cname(),
src->get_cname(), gw_dst->get_cname());
- TO_FLOYD_LINK(dst->id(), src->id()) =
- newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
+ TO_FLOYD_LINK(dst->id(), src->id()) = new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list, false);
TO_FLOYD_PRED(dst->id(), src->id()) = dst->id();
TO_FLOYD_COST(dst->id(), src->id()) =
(TO_FLOYD_LINK(dst->id(), src->id()))->link_list.size(); /* count of links, old model assume 1 */
}
}
-void FloydZone::seal()
+void FloydZone::do_seal()
{
/* set the size of table routing */
unsigned int table_size = get_table_size();
-
- if (not link_table_) {
- /* Create Cost, Predecessor and Link tables */
- cost_table_ = new double[table_size * table_size]; /* link cost from host to host */
- predecessor_table_ = new int[table_size * table_size]; /* predecessor host numbers */
- link_table_ = new RouteCreationArgs*[table_size * table_size]; /* actual link between src and dst */
-
- /* Initialize costs and predecessors */
- for (unsigned int i = 0; i < table_size; i++)
- for (unsigned int j = 0; j < table_size; j++) {
- TO_FLOYD_COST(i, j) = DBL_MAX;
- TO_FLOYD_PRED(i, j) = -1;
- TO_FLOYD_LINK(i, j) = nullptr;
- }
- }
+ init_tables(table_size);
/* Add the loopback if needed */
- if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
+ if (get_network_model()->loopback_ && get_hierarchy() == RoutingMode::base) {
for (unsigned int i = 0; i < table_size; i++) {
- RouteCreationArgs* e_route = TO_FLOYD_LINK(i, i);
- if (not e_route) {
- e_route = new RouteCreationArgs();
- e_route->link_list.push_back(surf_network_model->loopback_);
- TO_FLOYD_LINK(i, i) = e_route;
+ RouteCreationArgs* route = TO_FLOYD_LINK(i, i);
+ if (not route) {
+ route = new RouteCreationArgs();
+ route->link_list.push_back(get_network_model()->loopback_);
+ TO_FLOYD_LINK(i, i) = route;
TO_FLOYD_PRED(i, i) = i;
TO_FLOYD_COST(i, i) = 1;
}
}
}
}
+} // namespace routing
+} // namespace kernel
+
+namespace s4u {
+NetZone* create_floyd_zone(const std::string& name)
+{
+ return (new kernel::routing::FloydZone(name))->get_iface();
}
-}
-}
+} // namespace s4u
+
+} // namespace simgrid
