-/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-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/TorusZone.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/surf/network_interface.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#include <string>
#include <vector>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_torus, ker_platform, "Kernel Torus Routing");
namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace kernel ::routing {
void TorusZone::create_torus_links(unsigned long id, int rank, unsigned long position)
{
/* Create all links that exist in the torus. Each rank creates @a dimensions-1 links */
- int dim_product = 1; // Needed to calculate the next neighbor_id
+ unsigned long dim_product = 1; // Needed to calculate the next neighbor_id
for (unsigned long j = 0; j < dimensions_.size(); j++) {
unsigned long current_dimension =
return;
if (src->id() == dst->id() && has_loopback()) {
- resource::LinkImpl* uplink = get_uplink_from(node_pos(src->id()));
+ resource::StandardLinkImpl* uplink = get_uplink_from(node_pos(src->id()));
add_link_latency(route->link_list_, uplink, lat);
return;
route->link_list_.push_back(get_uplink_from(node_pos_with_loopback(current_node)));
}
- resource::LinkImpl* lnk;
+ resource::StandardLinkImpl* lnk;
if (use_lnk_up)
lnk = get_uplink_from(linkOffset);
else
route->gw_dst_ = get_gateway(dst->id());
}
-} // namespace routing
-} // namespace kernel
+} // namespace kernel::routing
namespace s4u {