-/* Copyright (c) 2014-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2021. 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 "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
-
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
namespace kernel {
namespace routing {
-FatTreeZone::FatTreeZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel)
- : ClusterZone(father, name, netmodel)
-{
- XBT_DEBUG("Creating a new fat tree.");
-}
-
FatTreeZone::~FatTreeZone()
{
- for (FatTreeNode const* node : this->nodes_) {
+ for (FatTreeNode const* node : this->nodes_)
delete node;
- }
- for (FatTreeLink const* link : this->links_) {
+ for (FatTreeLink const* link : this->links_)
delete link;
- }
}
bool FatTreeZone::is_in_sub_tree(FatTreeNode* root, FatTreeNode* node) const
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->has_loopback_) {
+ if (source->id == destination->id && has_loopback()) {
into->link_list.push_back(source->loopback);
if (latency)
*latency += source->loopback->get_latency();
if (latency)
*latency += currentNode->parents[d]->up_link_->get_latency();
- if (this->has_limiter_)
+ if (has_limiter())
into->link_list.push_back(currentNode->limiter_link_);
currentNode = currentNode->parents[d]->up_node_;
}
if (latency)
*latency += currentNode->children[i]->down_link_->get_latency();
currentNode = currentNode->children[i]->down_node_;
- if (this->has_limiter_)
+ if (has_limiter())
into->link_list.push_back(currentNode->limiter_link_);
XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id, destination->level,
destination->position, currentNode->id, currentNode->level, currentNode->position);
/* 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;
int FatTreeZone::connect_node_to_parents(FatTreeNode* node)
{
- std::vector<FatTreeNode*>::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->get_level_position(level + 1);
for (unsigned int i = 0; i < this->nodes_by_level_[level + 1]; i++) {
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++) {
- FatTreeNode* newNode = new FatTreeNode(this->cluster_, --k, i + 1, j);
+ auto* newNode = new FatTreeNode(this->cluster_, --k, i + 1, j);
XBT_DEBUG("We create the switch %d(%u,%u)", newNode->id, newNode->level, newNode->position);
newNode->children.resize(this->num_children_per_node_[i] * this->num_port_lower_level_[i]);
if (i != this->levels_ - 1) {
LinkCreationArgs linkTemplate;
if (cluster->limiter_link != 0.0) {
linkTemplate.bandwidths.push_back(cluster->limiter_link);
- linkTemplate.latency = 0;
- linkTemplate.policy = s4u::Link::SharingPolicy::SHARED;
- linkTemplate.id = "limiter_"+std::to_string(id);
+ linkTemplate.latency = 0;
+ linkTemplate.policy = s4u::Link::SharingPolicy::SHARED;
+ linkTemplate.id = "limiter_" + std::to_string(id);
sg_platf_new_link(&linkTemplate);
this->limiter_link_ = s4u::Link::by_name(linkTemplate.id)->get_impl();
}
if (cluster->loopback_bw != 0.0 || cluster->loopback_lat != 0.0) {
linkTemplate.bandwidths.push_back(cluster->loopback_bw);
- linkTemplate.latency = cluster->loopback_lat;
- linkTemplate.policy = s4u::Link::SharingPolicy::FATPIPE;
- linkTemplate.id = "loopback_"+ std::to_string(id);
+ linkTemplate.latency = cluster->loopback_lat;
+ linkTemplate.policy = s4u::Link::SharingPolicy::FATPIPE;
+ linkTemplate.id = "loopback_" + std::to_string(id);
sg_platf_new_link(&linkTemplate);
this->loopback = s4u::Link::by_name(linkTemplate.id)->get_impl();
}
static int uniqueId = 0;
LinkCreationArgs linkTemplate;
linkTemplate.bandwidths.push_back(cluster->bw);
- linkTemplate.latency = cluster->lat;
- linkTemplate.policy = cluster->sharing_policy; // sthg to do with that ?
+ 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);
}
} // namespace routing
} // namespace kernel
+
+namespace s4u {
+NetZone* create_fatTree_zone(const std::string& name)
+{
+ return (new kernel::routing::FatTreeZone(name))->get_iface();
+}
+} // namespace s4u
+
} // namespace simgrid