-/* 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;
* both arrays, we can easily assess whether we need to route into this dimension or not.
*/
const unsigned long dsize = dimensions_.size();
- std::vector<unsigned int> myCoords(dsize);
- std::vector<unsigned int> targetCoords(dsize);
+ std::vector<unsigned long> myCoords(dsize);
+ std::vector<unsigned long> targetCoords(dsize);
unsigned int dim_size_product = 1;
for (unsigned long i = 0; i < dsize; i++) {
unsigned long cur_dim_size = dimensions_[i];
bool use_lnk_up = false; // Is this link of the form "cur -> next" or "next -> cur"? false means: next -> cur
unsigned long current_node = src->id();
while (current_node != dst->id()) {
- unsigned int next_node = 0;
- unsigned int dim_product = 1; // First, we will route in x-dimension
- for (unsigned j = 0; j < dsize; j++) {
+ unsigned long next_node = 0;
+ unsigned long dim_product = 1; // First, we will route in x-dimension
+ for (unsigned long j = 0; j < dsize; j++) {
const unsigned long cur_dim = dimensions_[j];
// current_node/dim_product = position in current dimension
if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) {
linkOffset = node_pos_with_loopback_limiter(next_node) + j;
use_lnk_up = false;
}
- XBT_DEBUG("torus_get_route_and_latency - current_node: %lu, next_node: %u, linkOffset is %lu", current_node,
+ XBT_DEBUG("torus_get_route_and_latency - current_node: %lu, next_node: %lu, linkOffset is %lu", current_node,
next_node, linkOffset);
break;
}
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 {