-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2020. 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. */
namespace simgrid {
namespace kernel {
namespace routing {
-FullZone::FullZone(NetZoneImpl* father, std::string name) : RoutedZone(father, name) {}
+FullZone::FullZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
+ : RoutedZone(father, name, netmodel)
+{
+}
void FullZone::seal()
{
unsigned int table_size = get_table_size();
/* Create table if needed */
- if (not routing_table_)
- routing_table_ = new RouteCreationArgs*[table_size * table_size]();
+ if (routing_table_.empty())
+ routing_table_.resize(table_size * table_size, nullptr);
/* Add the loopback if needed */
- if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
+ if (network_model_->loopback_ && hierarchy_ == RoutingMode::base) {
for (unsigned int i = 0; i < table_size; i++) {
- RouteCreationArgs* e_route = TO_ROUTE_FULL(i, i);
- if (not e_route) {
- e_route = new RouteCreationArgs();
- e_route->link_list.push_back(surf_network_model->loopback_);
- TO_ROUTE_FULL(i, i) = e_route;
+ 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;
}
}
}
FullZone::~FullZone()
{
- 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_;
- }
+ /* Delete routing table */
+ for (auto const* route : routing_table_)
+ delete route;
}
void FullZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* res, double* lat)
XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", 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 RouteCreationArgs* e_route = TO_ROUTE_FULL(src->id(), dst->id());
if (e_route != nullptr) {
res->gw_src = e_route->gw_src;
unsigned int table_size = get_table_size();
- if (not routing_table_)
- routing_table_ = new RouteCreationArgs*[table_size * table_size]();
+ if (routing_table_.empty())
+ routing_table_.resize(table_size * table_size, nullptr);
/* Check that the route does not already exist */
if (gw_dst) // inter-zone route (to adapt the error message, if any)
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);
+ TO_ROUTE_FULL(src->id(), dst->id()) = new_extended_route(hierarchy_, gw_src, gw_dst, link_list, true);
- if (symmetrical == true && src != dst) {
+ if (symmetrical && src != dst) {
if (gw_dst && gw_src) {
NetPoint* gw_tmp = gw_src;
gw_src = gw_dst;
"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);
+ TO_ROUTE_FULL(dst->id(), src->id()) = new_extended_route(hierarchy_, gw_src, gw_dst, link_list, false);
}
}
}