-/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2020. 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. */
namespace kernel {
namespace routing {
-FatTreeZone::FatTreeZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+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 (unsigned int i = 0; i < this->nodes_.size(); i++) {
- delete this->nodes_[i];
+ for (FatTreeNode const* node : this->nodes_) {
+ delete node;
}
- for (unsigned int i = 0; i < this->links_.size(); i++) {
- delete this->links_[i];
+ for (FatTreeLink const* link : this->links_) {
+ delete link;
}
}
void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency)
{
-
if (dst->is_router() || src->is_router())
return;
msgBuffer.str("");
msgBuffer << "Nodes are : ";
- for (unsigned int i = 0; i < this->nodes_.size(); i++) {
- msgBuffer << this->nodes_[i]->id << "(" << this->nodes_[i]->level << "," << this->nodes_[i]->position << ") ";
+ for (FatTreeNode 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]->up_node_->id << "," << this->links_[i]->down_node_->id << ") ";
+ for (FatTreeLink const* link : this->links_) {
+ msgBuffer << "(" << link->up_node_->id << "," << link->down_node_->id << ") ";
}
XBT_DEBUG("%s", msgBuffer.str().c_str());
}
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->nodes_by_level_[0]) +
"nodes, we got " + std::to_string(this->nodes_.size()));
- return;
}
for (unsigned int i = 0; i < this->levels_; i++) {
}
for (unsigned int j = 0; j < this->nodes_by_level_[i]; j++) {
-
if (XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
std::stringstream msgBuffer;
std::vector<std::string> parameters;
std::vector<std::string> tmp;
boost::split(parameters, cluster->topo_parameters, boost::is_any_of(";"));
- const std::string error_msg {"Fat trees are defined by the levels number and 3 vectors, see the documentation for more information"};
// TODO : we have to check for zeros and negative numbers, or it might crash
- if (parameters.size() != 4) {
- surf_parse_error(error_msg);
- }
+ 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]);
+ } 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(error_msg);
- }
- for (size_t i = 0; i < tmp.size(); i++) {
+ surf_parse_assert(tmp.size() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) +
+ " levels but the child count vector (the first one) contains " +
+ std::to_string(tmp.size()) + " levels.");
+
+ for (std::string const& level : tmp) {
try {
- this->num_children_per_node_.push_back(std::stoi(tmp[i]));
- } catch (std::invalid_argument& ia) {
- throw std::invalid_argument(std::string("Invalid lower level node number:") + tmp[i]);
+ this->num_children_per_node_.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(error_msg);
- }
- for (size_t i = 0; i < tmp.size(); i++) {
+ surf_parse_assert(tmp.size() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) +
+ " levels but the parent count vector (the second one) contains " +
+ std::to_string(tmp.size()) + " levels.");
+ for (std::string const& parent : tmp) {
try {
- this->num_parents_per_node_.push_back(std::stoi(tmp[i]));
- } catch (std::invalid_argument& ia) {
- throw std::invalid_argument(std::string("Invalid upper level node number:") + tmp[i]);
+ this->num_parents_per_node_.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(error_msg);
- }
- for (size_t i = 0; i < tmp.size(); i++) {
+ surf_parse_assert(tmp.size() == this->levels_, std::string("You specified ") + std::to_string(this->levels_) +
+ " levels but the port count vector (the third one) contains " +
+ std::to_string(tmp.size()) + " levels.");
+ for (std::string const& port : tmp) {
try {
- this->num_port_lower_level_.push_back(std::stoi(tmp[i]));
- } catch (std::invalid_argument& ia) {
- throw std::invalid_argument(std::string("Invalid lower level port number:") + tmp[i]);
+ this->num_port_lower_level_.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;
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 (FatTreeNode 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]->down_node_->id << " -- " << this->links_[i]->up_node_->id << ";\n";
+ for (FatTreeLink const* link : this->links_) {
+ file << link->down_node_->id << " -- " << link->up_node_->id << ";\n";
}
file << "}";
file.close();
}
-FatTreeNode::FatTreeNode(ClusterCreationArgs* cluster, int id, int level, int position)
+FatTreeNode::FatTreeNode(const ClusterCreationArgs* cluster, int id, int level, int position)
: id(id), level(level), position(position)
{
LinkCreationArgs linkTemplate;
if (cluster->limiter_link) {
- linkTemplate.bandwidth = cluster->limiter_link;
+ linkTemplate.bandwidths.push_back(cluster->limiter_link);
linkTemplate.latency = 0;
linkTemplate.policy = s4u::Link::SharingPolicy::SHARED;
linkTemplate.id = "limiter_"+std::to_string(id);
this->limiter_link_ = s4u::Link::by_name(linkTemplate.id)->get_impl();
}
if (cluster->loopback_bw || cluster->loopback_lat) {
- linkTemplate.bandwidth = cluster->loopback_bw;
+ 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);
}
}
-FatTreeLink::FatTreeLink(ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode)
+FatTreeLink::FatTreeLink(const ClusterCreationArgs* cluster, FatTreeNode* downNode, FatTreeNode* upNode)
: up_node_(upNode), down_node_(downNode)
{
static int uniqueId = 0;
LinkCreationArgs linkTemplate;
- linkTemplate.bandwidth = cluster->bw;
+ linkTemplate.bandwidths.push_back(cluster->bw);
linkTemplate.latency = cluster->lat;
linkTemplate.policy = cluster->sharing_policy; // sthg to do with that ?
linkTemplate.id =
}
uniqueId++;
}
-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
