X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b87fc0829538ec066fd077e6c30ee6270b8abd78..040d8fa855d2b6ac9884f68108a09b935570be21:/src/kernel/routing/FatTreeZone.cpp diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index c6485c8540..2183e2f2da 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -1,41 +1,29 @@ -/* Copyright (c) 2014-2017. 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 +#include + +#include "src/kernel/resource/StandardLinkImpl.hpp" +#include "src/surf/xml/platf.hpp" // surf_parse_error() and surf_parse_assert() + #include +#include #include #include -#include "src/kernel/routing/FatTreeZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include "src/surf/network_interface.hpp" - #include #include -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 { namespace routing { -FatTreeZone::FatTreeZone(NetZone* father, std::string name) : ClusterZone(father, name) -{ - XBT_DEBUG("Creating a new fat tree."); -} - -FatTreeZone::~FatTreeZone() -{ - for (unsigned int i = 0; i < this->nodes_.size(); i++) { - delete this->nodes_[i]; - } - for (unsigned int i = 0; i < this->links_.size(); i++) { - delete this->links_[i]; - } -} - -bool FatTreeZone::isInSubTree(FatTreeNode* root, FatTreeNode* node) +bool FatTreeZone::is_in_sub_tree(const FatTreeNode* root, const FatTreeNode* node) const { XBT_DEBUG("Is %d(%u,%u) in the sub tree of %d(%u,%u) ?", node->id, node->level, node->position, root->id, root->level, root->position); @@ -56,53 +44,49 @@ bool FatTreeZone::isInSubTree(FatTreeNode* root, FatTreeNode* node) return true; } -void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t into, double* latency) +void FatTreeZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* into, double* latency) { - - if (dst->isRouter() || src->isRouter()) + if (dst->is_router() || src->is_router()) return; /* Let's find the source and the destination in our internal structure */ - auto searchedNode = this->computeNodes_.find(src->id()); - xbt_assert(searchedNode != this->computeNodes_.end(), "Could not find the source %s [%u] in the fat tree", - src->name().c_str(), src->id()); - FatTreeNode* source = searchedNode->second; + auto searchedNode = this->compute_nodes_.find(src->id()); + xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the source %s [%lu] in the fat tree", + src->get_cname(), src->id()); + const FatTreeNode* source = searchedNode->second.get(); - searchedNode = this->computeNodes_.find(dst->id()); - xbt_assert(searchedNode != this->computeNodes_.end(), "Could not find the destination %s [%u] in the fat tree", - dst->name().c_str(), dst->id()); - FatTreeNode* destination = searchedNode->second; + searchedNode = this->compute_nodes_.find(dst->id()); + xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the destination %s [%lu] in the fat tree", + dst->get_cname(), dst->id()); + const FatTreeNode* destination = searchedNode->second.get(); - XBT_VERB("Get route and latency from '%s' [%u] to '%s' [%u] in a fat tree", src->name().c_str(), src->id(), - dst->name().c_str(), dst->id()); + XBT_VERB("Get route and latency from '%s' [%lu] to '%s' [%lu] in a fat tree", src->get_cname(), src->id(), + dst->get_cname(), dst->id()); /* In case destination is the source, and there is a loopback, let's use it instead of going up to a switch */ - if (source->id == destination->id && this->hasLoopback_) { - into->link_list->push_back(source->loopback); - if (latency) - *latency += source->loopback->latency(); + if (source->id == destination->id && has_loopback()) { + add_link_latency(into->link_list_, source->loopback_, latency); return; } - FatTreeNode* currentNode = source; + const FatTreeNode* currentNode = source; // up part - while (not isInSubTree(currentNode, destination)) { + while (not is_in_sub_tree(currentNode, destination)) { int d = destination->position; // as in d-mod-k for (unsigned int i = 0; i < currentNode->level; i++) - d /= this->upperLevelNodesNumber_[i]; + d /= this->num_parents_per_node_[i]; - int k = this->upperLevelNodesNumber_[currentNode->level]; + int k = this->num_parents_per_node_[currentNode->level]; d = d % k; - into->link_list->push_back(currentNode->parents[d]->upLink); - if (latency) - *latency += currentNode->parents[d]->upLink->latency(); + if (currentNode->limiter_link_) + into->link_list_.push_back(currentNode->limiter_link_); - if (this->hasLimiter_) - into->link_list->push_back(currentNode->limiterLink); - currentNode = currentNode->parents[d]->upNode; + add_link_latency(into->link_list_, currentNode->parents[d]->up_link_, latency); + + currentNode = currentNode->parents[d]->up_node_; } XBT_DEBUG("%d(%u,%u) is in the sub tree of %d(%u,%u).", destination->id, destination->level, destination->position, @@ -111,85 +95,91 @@ void FatTreeZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba // Down part while (currentNode != destination) { for (unsigned int i = 0; i < currentNode->children.size(); i++) { - if (i % this->lowerLevelNodesNumber_[currentNode->level - 1] == destination->label[currentNode->level - 1]) { - into->link_list->push_back(currentNode->children[i]->downLink); - if (latency) - *latency += currentNode->children[i]->downLink->latency(); - currentNode = currentNode->children[i]->downNode; - if (this->hasLimiter_) - into->link_list->push_back(currentNode->limiterLink); + if (i % this->num_children_per_node_[currentNode->level - 1] == destination->label[currentNode->level - 1]) { + add_link_latency(into->link_list_, currentNode->children[i]->down_link_, latency); + + if (currentNode->limiter_link_) + into->link_list_.push_back(currentNode->limiter_link_); + + currentNode = currentNode->children[i]->down_node_; XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id, destination->level, destination->position, currentNode->id, currentNode->level, currentNode->position); } } } + if (currentNode->limiter_link_) { // limiter for receiver/destination + into->link_list_.push_back(currentNode->limiter_link_); + } + // set gateways (if any) + into->gw_src_ = get_gateway(src->id()); + into->gw_dst_ = get_gateway(dst->id()); +} + +void FatTreeZone::build_upper_levels(const s4u::ClusterCallbacks& set_callbacks) +{ + generate_switches(set_callbacks); + generate_labels(); + + unsigned int k = 0; + // Nodes are totally ordered, by level and then by position, in this->nodes + for (unsigned int i = 0; i < levels_; i++) { + for (unsigned int j = 0; j < nodes_by_level_[i]; j++) { + connect_node_to_parents(nodes_[k].get()); + k++; + } + } } -/* This function makes the assumption that parse_specific_arguments() and - * addNodes() have already been called - */ -void FatTreeZone::seal() +void FatTreeZone::do_seal() { if (this->levels_ == 0) { return; } - this->generateSwitches(); - - if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { - std::stringstream msgBuffer; + if (not XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) { + return; + } - msgBuffer << "We are creating a fat tree of " << this->levels_ << " levels " - << "with " << this->nodesByLevel_[0] << " processing nodes"; - for (unsigned int i = 1; i <= this->levels_; i++) { - msgBuffer << ", " << this->nodesByLevel_[i] << " switches at level " << i; - } - XBT_DEBUG("%s", msgBuffer.str().c_str()); - msgBuffer.str(""); - msgBuffer << "Nodes are : "; + /* for debugging purpose only, Fat-Tree is already build when seal is called */ + std::stringstream msgBuffer; - for (unsigned int i = 0; i < this->nodes_.size(); i++) { - msgBuffer << this->nodes_[i]->id << "(" << this->nodes_[i]->level << "," << this->nodes_[i]->position << ") "; - } - XBT_DEBUG("%s", msgBuffer.str().c_str()); + msgBuffer << "We are creating a fat tree of " << this->levels_ << " levels " + << "with " << this->nodes_by_level_[0] << " processing nodes"; + for (unsigned int i = 1; i <= this->levels_; i++) { + msgBuffer << ", " << this->nodes_by_level_[i] << " switches at level " << i; } + XBT_DEBUG("%s", msgBuffer.str().c_str()); + msgBuffer.str(""); + msgBuffer << "Nodes are : "; - this->generateLabels(); - - unsigned int k = 0; - // Nodes are totally ordered, by level and then by position, in this->nodes - for (unsigned int i = 0; i < this->levels_; i++) { - for (unsigned int j = 0; j < this->nodesByLevel_[i]; j++) { - this->connectNodeToParents(this->nodes_[k]); - k++; - } + for (auto const& node : this->nodes_) { + msgBuffer << node->id << "(" << node->level << "," << node->position << ") "; } + XBT_DEBUG("%s", msgBuffer.str().c_str()); - if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { - std::stringstream msgBuffer; - msgBuffer << "Links are : "; - for (unsigned int i = 0; i < this->links_.size(); i++) { - msgBuffer << "(" << this->links_[i]->upNode->id << "," << this->links_[i]->downNode->id << ") "; - } - XBT_DEBUG("%s", msgBuffer.str().c_str()); + msgBuffer.clear(); + msgBuffer << "Links are : "; + for (auto const& link : this->links_) { + msgBuffer << "(" << link->up_node_->id << "," << link->down_node_->id << ") "; } + XBT_DEBUG("%s", msgBuffer.str().c_str()); } -int FatTreeZone::connectNodeToParents(FatTreeNode* node) +int FatTreeZone::connect_node_to_parents(FatTreeNode* node) { - std::vector::iterator currentParentNode = this->nodes_.begin(); - int connectionsNumber = 0; - const int level = node->level; + auto currentParentNode = this->nodes_.begin(); + int connectionsNumber = 0; + const int level = node->level; XBT_DEBUG("We are connecting node %d(%u,%u) to his parents.", node->id, node->level, node->position); - currentParentNode += this->getLevelPosition(level + 1); - for (unsigned int i = 0; i < this->nodesByLevel_[level + 1]; i++) { - if (this->areRelated(*currentParentNode, node)) { + currentParentNode += this->get_level_position(level + 1); + for (unsigned int i = 0; i < this->nodes_by_level_[level + 1]; i++) { + if (this->are_related(currentParentNode->get(), node)) { XBT_DEBUG("%d(%u,%u) and %d(%u,%u) are related," " with %u links between them.", node->id, node->level, node->position, (*currentParentNode)->id, (*currentParentNode)->level, - (*currentParentNode)->position, this->lowerLevelPortsNumber_[level]); - for (unsigned int j = 0; j < this->lowerLevelPortsNumber_[level]; j++) { - this->addLink(*currentParentNode, node->label[level] + j * this->lowerLevelNodesNumber_[level], node, - (*currentParentNode)->label[level] + j * this->upperLevelNodesNumber_[level]); + (*currentParentNode)->position, this->num_port_lower_level_[level]); + for (unsigned int j = 0; j < this->num_port_lower_level_[level]; j++) { + this->add_link(currentParentNode->get(), node->label[level] + j * this->num_children_per_node_[level], node, + (*currentParentNode)->label[level] + j * this->num_parents_per_node_[level]); } connectionsNumber++; } @@ -198,11 +188,11 @@ int FatTreeZone::connectNodeToParents(FatTreeNode* node) return connectionsNumber; } -bool FatTreeZone::areRelated(FatTreeNode* parent, FatTreeNode* child) +bool FatTreeZone::are_related(FatTreeNode* parent, FatTreeNode* child) const { 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++) { @@ -230,52 +220,64 @@ bool FatTreeZone::areRelated(FatTreeNode* parent, FatTreeNode* child) return true; } -void FatTreeZone::generateSwitches() +void FatTreeZone::generate_switches(const s4u::ClusterCallbacks& set_callbacks) { XBT_DEBUG("Generating switches."); - this->nodesByLevel_.resize(this->levels_ + 1, 0); + this->nodes_by_level_.resize(this->levels_ + 1, 0); // Take care of the number of nodes by level - this->nodesByLevel_[0] = 1; + this->nodes_by_level_[0] = 1; for (unsigned int i = 0; i < this->levels_; i++) - this->nodesByLevel_[0] *= this->lowerLevelNodesNumber_[i]; + this->nodes_by_level_[0] *= this->num_children_per_node_[i]; - if (this->nodesByLevel_[0] != this->nodes_.size()) { + if (this->nodes_by_level_[0] != this->nodes_.size()) { surf_parse_error(std::string("The number of provided nodes does not fit with the wanted topology.") + - " Please check your platform description (We need " + std::to_string(this->nodesByLevel_[0]) + + " Please check your platform description (We need " + std::to_string(this->nodes_by_level_[0]) + "nodes, we got " + std::to_string(this->nodes_.size())); - return; } for (unsigned int i = 0; i < this->levels_; i++) { int nodesInThisLevel = 1; for (unsigned int j = 0; j <= i; j++) - nodesInThisLevel *= this->upperLevelNodesNumber_[j]; + nodesInThisLevel *= this->num_parents_per_node_[j]; for (unsigned int j = i + 1; j < this->levels_; j++) - nodesInThisLevel *= this->lowerLevelNodesNumber_[j]; + nodesInThisLevel *= this->num_children_per_node_[j]; - this->nodesByLevel_[i + 1] = nodesInThisLevel; + this->nodes_by_level_[i + 1] = nodesInThisLevel; } + /* get limiter for this router */ + 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) { + limiter = s4u_link->get_impl(); + } + } + return limiter; + }; // Create the switches - int k = 0; - for (unsigned int i = 0; i < this->levels_; i++) { - for (unsigned int j = 0; j < this->nodesByLevel_[i + 1]; j++) { - FatTreeNode* newNode = new FatTreeNode(this->cluster_, --k, 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(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); - newNode->children.resize(this->lowerLevelNodesNumber_[i] * this->lowerLevelPortsNumber_[i]); + newNode->children.resize(static_cast(this->num_children_per_node_[i]) * this->num_port_lower_level_[i]); if (i != this->levels_ - 1) { - newNode->parents.resize(this->upperLevelNodesNumber_[i + 1] * this->lowerLevelPortsNumber_[i + 1]); + newNode->parents.resize(static_cast(this->num_parents_per_node_[i + 1]) * + this->num_port_lower_level_[i + 1]); } newNode->label.resize(this->levels_); - this->nodes_.push_back(newNode); + this->nodes_.emplace_back(newNode); } } } -void FatTreeZone::generateLabels() +void FatTreeZone::generate_labels() { XBT_DEBUG("Generating labels."); // TODO : check if nodesByLevel and nodes are filled @@ -285,12 +287,11 @@ void FatTreeZone::generateLabels() for (unsigned int i = 0; i <= this->levels_; i++) { currentLabel.assign(this->levels_, 0); for (unsigned int j = 0; j < this->levels_; j++) { - maxLabel[j] = j + 1 > i ? this->lowerLevelNodesNumber_[j] : this->upperLevelNodesNumber_[j]; + maxLabel[j] = j + 1 > i ? this->num_children_per_node_[j] : this->num_parents_per_node_[j]; } - for (unsigned int j = 0; j < this->nodesByLevel_[i]; j++) { - - if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) { + for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) { + if (XBT_LOG_ISENABLED(ker_routing_fat_tree, xbt_log_priority_debug)) { std::stringstream msgBuffer; msgBuffer << "Assigning label <"; @@ -321,171 +322,216 @@ void FatTreeZone::generateLabels() } } -int FatTreeZone::getLevelPosition(const unsigned int level) +int FatTreeZone::get_level_position(const unsigned int level) { xbt_assert(level <= this->levels_, "The impossible did happen. Yet again."); int tempPosition = 0; for (unsigned int i = 0; i < level; i++) - tempPosition += this->nodesByLevel_[i]; + tempPosition += this->nodes_by_level_[i]; return tempPosition; } -void FatTreeZone::addProcessingNode(int id) +void FatTreeZone::add_processing_node(int id, resource::StandardLinkImpl* limiter, resource::StandardLinkImpl* loopback) { using std::make_pair; static int position = 0; - FatTreeNode* newNode; - newNode = new FatTreeNode(this->cluster_, id, 0, position++); - newNode->parents.resize(this->upperLevelNodesNumber_[0] * this->lowerLevelPortsNumber_[0]); + auto newNode = std::make_shared(id, 0, position, limiter, loopback); + position++; + newNode->parents.resize(static_cast(this->num_parents_per_node_[0]) * this->num_port_lower_level_[0]); newNode->label.resize(this->levels_); - this->computeNodes_.insert(make_pair(id, newNode)); - this->nodes_.push_back(newNode); + this->compute_nodes_.insert(make_pair(id, newNode)); + this->nodes_.emplace_back(newNode); } -void FatTreeZone::addLink(FatTreeNode* parent, unsigned int parentPort, FatTreeNode* child, unsigned int childPort) +void FatTreeZone::add_link(FatTreeNode* parent, unsigned int parentPort, FatTreeNode* child, unsigned int childPort) { - FatTreeLink* newLink; - newLink = new FatTreeLink(this->cluster_, child, parent); + static int uniqueId = 0; + const s4u::Link* linkup; + const s4u::Link* linkdown; + std::string id = + "link_from_" + std::to_string(child->id) + "_" + std::to_string(parent->id) + "_" + std::to_string(uniqueId); + + if (get_link_sharing_policy() == s4u::Link::SharingPolicy::SPLITDUPLEX) { + linkup = create_link(id + "_UP", {get_link_bandwidth()})->set_latency(get_link_latency())->seal(); + linkdown = create_link(id + "_DOWN", {get_link_bandwidth()})->set_latency(get_link_latency())->seal(); + } else { + linkup = create_link(id, {get_link_bandwidth()})->set_latency(get_link_latency())->seal(); + linkdown = linkup; + } + uniqueId++; + + auto newLink = std::make_shared(child, parent, linkup->get_impl(), linkdown->get_impl()); XBT_DEBUG("Creating a link between the parent (%u,%u,%u) and the child (%u,%u,%u)", parent->level, parent->position, parentPort, child->level, child->position, childPort); parent->children[parentPort] = newLink; child->parents[childPort] = newLink; - this->links_.push_back(newLink); + this->links_.emplace_back(newLink); +} + +void FatTreeZone::check_topology(unsigned int n_levels, const std::vector& down_links, + const std::vector& up_links, const std::vector& link_count) + +{ + /* check number of levels */ + if (n_levels == 0) + throw std::invalid_argument("FatTreeZone: invalid number of levels, must be > 0"); + + auto check_vector = [&n_levels](const std::vector& vector, const std::string& var_name) { + if (vector.size() != n_levels) + throw std::invalid_argument("FatTreeZone: invalid " + var_name + " parameter, vector has " + + std::to_string(vector.size()) + " elements, must have " + std::to_string(n_levels)); + + auto check_zero = [](unsigned int i) { return i == 0; }; + if (std::any_of(vector.begin(), vector.end(), check_zero)) + throw std::invalid_argument("FatTreeZone: invalid " + var_name + " parameter, all values must be greater than 0"); + }; + + /* check remaining vectors */ + check_vector(down_links, "down links"); + check_vector(up_links, "up links"); + check_vector(link_count, "link count"); } -void FatTreeZone::parse_specific_arguments(ClusterCreationArgs* cluster) +void FatTreeZone::set_topology(unsigned int n_levels, const std::vector& down_links, + const std::vector& up_links, const std::vector& link_count) +{ + levels_ = n_levels; + num_children_per_node_ = down_links; + num_parents_per_node_ = up_links; + num_port_lower_level_ = link_count; +} + +s4u::FatTreeParams FatTreeZone::parse_topo_parameters(const std::string& topo_parameters) { std::vector parameters; std::vector tmp; - boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";")); + unsigned int n_lev = 0; + std::vector down; + std::vector up; + std::vector count; + boost::split(parameters, topo_parameters, boost::is_any_of(";")); - // TODO : we have to check for zeros and negative numbers, or it might crash - if (parameters.size() != 4) { - surf_parse_error( - "Fat trees are defined by the levels number and 3 vectors, see the documentation for more information"); - } + surf_parse_assert( + parameters.size() == 4, + "Fat trees are defined by the levels number and 3 vectors, see the documentation for more information."); // The first parts of topo_parameters should be the levels number try { - this->levels_ = std::stoi(parameters[0]); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("First parameter is not the amount of levels:") + parameters[0]); + n_lev = std::stoi(parameters[0]); + } catch (const std::invalid_argument&) { + surf_parse_error(std::string("First parameter is not the amount of levels: ") + parameters[0]); } // Then, a l-sized vector standing for the children number by level boost::split(tmp, parameters[1], boost::is_any_of(",")); - if (tmp.size() != this->levels_) { - surf_parse_error("Fat trees are defined by the levels number and 3 vectors" - ", see the documentation for more information"); - } - for (size_t i = 0; i < tmp.size(); i++) { + surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) + + " levels but the child count vector (the first one) contains " + + std::to_string(tmp.size()) + " levels."); + + for (std::string const& level : tmp) { try { - this->lowerLevelNodesNumber_.push_back(std::stoi(tmp[i])); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid lower level node number:") + tmp[i]); + down.push_back(std::stoi(level)); + } catch (const std::invalid_argument&) { + surf_parse_error(std::string("Invalid child count: ") + level); } } // Then, a l-sized vector standing for the parents number by level boost::split(tmp, parameters[2], boost::is_any_of(",")); - if (tmp.size() != this->levels_) { - surf_parse_error("Fat trees are defined by the levels number and 3 vectors" - ", see the documentation for more information"); - } - for (size_t i = 0; i < tmp.size(); i++) { + surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) + + " levels but the parent count vector (the second one) contains " + + std::to_string(tmp.size()) + " levels."); + for (std::string const& parent : tmp) { try { - this->upperLevelNodesNumber_.push_back(std::stoi(tmp[i])); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid upper level node number:") + tmp[i]); + up.push_back(std::stoi(parent)); + } catch (const std::invalid_argument&) { + surf_parse_error(std::string("Invalid parent count: ") + parent); } } // Finally, a l-sized vector standing for the ports number with the lower level boost::split(tmp, parameters[3], boost::is_any_of(",")); - if (tmp.size() != this->levels_) { - surf_parse_error("Fat trees are defined by the levels number and 3 vectors" - ", see the documentation for more information"); - } - for (size_t i = 0; i < tmp.size(); i++) { + surf_parse_assert(tmp.size() == n_lev, std::string("You specified ") + std::to_string(n_lev) + + " levels but the port count vector (the third one) contains " + + std::to_string(tmp.size()) + " levels."); + for (std::string const& port : tmp) { try { - this->lowerLevelPortsNumber_.push_back(std::stoi(tmp[i])); - } catch (std::invalid_argument& ia) { - throw std::invalid_argument(std::string("Invalid lower level port number:") + tmp[i]); + count.push_back(std::stoi(port)); + } catch (const std::invalid_argument&) { + throw std::invalid_argument(std::string("Invalid lower level port number:") + port); } } - this->cluster_ = cluster; + return s4u::FatTreeParams(n_lev, down, up, count); } -void FatTreeZone::generateDotFile(const std::string& filename) const +void FatTreeZone::generate_dot_file(const std::string& filename) const { std::ofstream file; file.open(filename, std::ios::out | std::ios::trunc); xbt_assert(file.is_open(), "Unable to open file %s", filename.c_str()); file << "graph AsClusterFatTree {\n"; - for (unsigned int i = 0; i < this->nodes_.size(); i++) { - file << this->nodes_[i]->id; - if (this->nodes_[i]->id < 0) + for (auto const& node : this->nodes_) { + file << node->id; + if (node->id < 0) file << " [shape=circle];\n"; else file << " [shape=hexagon];\n"; } - for (unsigned int i = 0; i < this->links_.size(); i++) { - file << this->links_[i]->downNode->id << " -- " << this->links_[i]->upNode->id << ";\n"; + for (auto const& link : this->links_) { + file << link->down_node_->id << " -- " << link->up_node_->id << ";\n"; } file << "}"; file.close(); } +} // namespace routing +} // namespace kernel -FatTreeNode::FatTreeNode(ClusterCreationArgs* cluster, int id, int level, int position) - : id(id), level(level), position(position) +namespace s4u { +FatTreeParams::FatTreeParams(unsigned int n_levels, const std::vector& down_links, + const std::vector& up_links, const std::vector& links_number) + : levels(n_levels), down(down_links), up(up_links), number(links_number) { - LinkCreationArgs linkTemplate; - if (cluster->limiter_link) { - linkTemplate.bandwidth = cluster->limiter_link; - linkTemplate.latency = 0; - linkTemplate.policy = SURF_LINK_SHARED; - linkTemplate.id = "limiter_"+std::to_string(id); - sg_platf_new_link(&linkTemplate); - this->limiterLink = surf::LinkImpl::byName(linkTemplate.id); - } - if (cluster->loopback_bw || cluster->loopback_lat) { - linkTemplate.bandwidth = cluster->loopback_bw; - linkTemplate.latency = cluster->loopback_lat; - linkTemplate.policy = SURF_LINK_FATPIPE; - linkTemplate.id = "loopback_"+ std::to_string(id); - sg_platf_new_link(&linkTemplate); - this->loopback = surf::LinkImpl::byName(linkTemplate.id); - } + kernel::routing::FatTreeZone::check_topology(levels, down, up, number); } -FatTreeLink::FatTreeLink(ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode) - : upNode(upNode), downNode(downNode) +NetZone* create_fatTree_zone(const std::string& name, const NetZone* parent, const FatTreeParams& params, + const ClusterCallbacks& set_callbacks, double bandwidth, double latency, + Link::SharingPolicy sharing_policy) { - static int uniqueId = 0; - LinkCreationArgs linkTemplate; - linkTemplate.bandwidth = cluster->bw; - linkTemplate.latency = cluster->lat; - linkTemplate.policy = cluster->sharing_policy; // sthg to do with that ? - linkTemplate.id = - "link_from_" + std::to_string(downNode->id) + "_" + std::to_string(upNode->id) + "_" + std::to_string(uniqueId); - sg_platf_new_link(&linkTemplate); - - if (cluster->sharing_policy == SURF_LINK_FULLDUPLEX) { - std::string tmpID = std::string(linkTemplate.id) + "_UP"; - this->upLink = surf::LinkImpl::byName(tmpID); // check link? - tmpID = std::string(linkTemplate.id) + "_DOWN"; - this->downLink = surf::LinkImpl::byName(tmpID); // check link ? - } else { - this->upLink = surf::LinkImpl::byName(linkTemplate.id); - this->downLink = this->upLink; - } - uniqueId++; -} + /* initial checks */ + if (bandwidth <= 0) + throw std::invalid_argument("FatTreeZone: incorrect bandwidth for internode communication, bw=" + + std::to_string(bandwidth)); + if (latency < 0) + throw std::invalid_argument("FatTreeZone: incorrect latency for internode communication, lat=" + + std::to_string(latency)); + + /* creating zone */ + auto* zone = new kernel::routing::FatTreeZone(name); + zone->set_topology(params.levels, params.down, params.up, params.number); + if (parent) + zone->set_parent(parent->get_impl()); + zone->set_link_characteristics(bandwidth, latency, sharing_policy); + + /* populating it */ + unsigned int tot_elements = std::accumulate(params.down.begin(), params.down.end(), 1, std::multiplies<>()); + for (unsigned int i = 0; i < tot_elements; i++) { + kernel::routing::NetPoint* netpoint; + Link* limiter; + Link* loopback; + /* coordinates are based on 2 indexes: number of levels and id */ + zone->fill_leaf_from_cb(i, {params.levels + 1, tot_elements}, set_callbacks, &netpoint, &loopback, &limiter); + zone->add_processing_node(i, limiter ? limiter->get_impl() : nullptr, loopback ? loopback->get_impl() : nullptr); + } + zone->build_upper_levels(set_callbacks); + + return zone->get_iface(); } -} -} // namespace +} // namespace s4u + +} // namespace simgrid