-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2019. 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 kernel {
namespace routing {
-FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name)
+FloydZone::FloydZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+ : RoutedZone(father, std::move(name), netmodel)
{
predecessor_table_ = nullptr;
cost_table_ = nullptr;
{
if (link_table_ == nullptr) // Dealing with a parse error in the file?
return;
- unsigned int table_size = getTableSize();
+ 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++)
void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
{
- unsigned int table_size = getTableSize();
+ 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;
std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
{
/* set the size of table routing */
- unsigned int table_size = getTableSize();
+ unsigned int table_size = get_table_size();
- addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
+ add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
if (not link_table_) {
/* Create Cost, Predecessor and Link tables */
dst->get_cname());
TO_FLOYD_LINK(src->id(), dst->id()) =
- newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
+ new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
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();
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);
+ new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
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()
{
/* set the size of table routing */
- unsigned int table_size = getTableSize();
+ unsigned int table_size = get_table_size();
if (not link_table_) {
/* Create Cost, Predecessor and Link tables */
}
/* 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_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(network_model_->loopback_);
+ TO_FLOYD_LINK(i, i) = route;
TO_FLOYD_PRED(i, i) = i;
TO_FLOYD_COST(i, i) = 1;
}