X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da23351cb44bc018edc2c181b90bcdb7083b061c..7a955948edf1a0c37594d87693315dfc2dac9a8f:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 57e7ffd88e..ca4c2def76 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -22,7 +22,8 @@ namespace simgrid { namespace kernel { namespace routing { -FloydZone::FloydZone(NetZoneImpl* father, std::string name) : RoutedZone(father, name) +FloydZone::FloydZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel) + : RoutedZone(father, name, netmodel) { predecessor_table_ = nullptr; cost_table_ = nullptr; @@ -175,13 +176,13 @@ void FloydZone::seal() } /* 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; }