X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..371d168e21b83e2364c2ac2dbff3847588769c2b:/src/kernel/routing/FloydZone.cpp diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp index 8de2e8cd46..350ce04177 100644 --- a/src/kernel/routing/FloydZone.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -1,21 +1,20 @@ -/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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/FloydZone.hpp" -#include "simgrid/kernel/routing/NetPoint.hpp" -#include "src/surf/network_interface.hpp" -#include "surf/surf.hpp" -#include "xbt/string.hpp" +#include +#include +#include + +#include "src/kernel/resource/NetworkModel.hpp" #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_floyd, ker_platform, "Kernel Floyd Routing"); namespace simgrid { -namespace kernel { -namespace routing { +namespace kernel::routing { void FloydZone::init_tables(unsigned int table_size) { @@ -135,7 +134,7 @@ void FloydZone::do_seal() auto& route = link_table_[i][i]; if (not route) { route.reset(new Route()); - route->link_list_.push_back(get_network_model()->loopback_); + route->link_list_.push_back(get_network_model()->loopback_.get()); predecessor_table_[i][i] = i; cost_table_[i][i] = 1; } @@ -154,8 +153,7 @@ void FloydZone::do_seal() } } } -} // namespace routing -} // namespace kernel +} // namespace kernel::routing namespace s4u { NetZone* create_floyd_zone(const std::string& name)