-/* Copyright (c) 2014-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2022. 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/FatTreeZone.hpp>
+#include <simgrid/kernel/routing/NetPoint.hpp>
+
+#include "src/kernel/resource/StandardLinkImpl.hpp"
+#include "src/surf/xml/platf.hpp" // surf_parse_error() and surf_parse_assert()
+
#include <fstream>
#include <numeric>
#include <sstream>
#include <string>
-#include "simgrid/kernel/routing/FatTreeZone.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp"
-
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_fat_tree, ker_routing, "Kernel Fat-Tree Routing");
namespace simgrid {
namespace kernel {
if (this->levels_ == 0) {
return;
}
- if (not XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+ if (not XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) {
return;
}
{
std::stringstream msgBuffer;
- if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+ if (XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) {
msgBuffer << "Are " << child->id << "(" << child->level << "," << child->position << ") <";
for (unsigned int i = 0; i < this->levels_; i++) {
}
/* get limiter for this router */
- auto get_limiter = [this, &set_callbacks](unsigned int i, unsigned int j, int id) -> resource::LinkImpl* {
- kernel::resource::LinkImpl* limiter = nullptr;
+ auto get_limiter = [this, &set_callbacks](unsigned long i, unsigned long j, long id) -> resource::StandardLinkImpl* {
+ kernel::resource::StandardLinkImpl* limiter = nullptr;
if (set_callbacks.limiter) {
const auto* s4u_link = set_callbacks.limiter(get_iface(), {i + 1, j}, id);
if (s4u_link) {
return limiter;
};
// Create the switches
- int k = 0;
- for (unsigned int i = 0; i < this->levels_; i++) {
- for (unsigned int j = 0; j < this->nodes_by_level_[i + 1]; j++) {
+ unsigned long k = 2 * nodes_.size();
+ for (unsigned long i = 0; i < this->levels_; i++) {
+ for (unsigned long j = 0; j < this->nodes_by_level_[i + 1]; j++) {
k--;
auto newNode = std::make_shared<FatTreeNode>(k, i + 1, j, get_limiter(i, j, k), nullptr);
XBT_DEBUG("We create the switch %d(%u,%u)", newNode->id, newNode->level, newNode->position);
}
for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) {
- if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+ if (XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) {
std::stringstream msgBuffer;
msgBuffer << "Assigning label <";
return tempPosition;
}
-void FatTreeZone::add_processing_node(int id, resource::LinkImpl* limiter, resource::LinkImpl* loopback)
+void FatTreeZone::add_processing_node(int id, resource::StandardLinkImpl* limiter, resource::StandardLinkImpl* loopback)
{
using std::make_pair;
static int position = 0;