From: Bruno Donassolo Date: Wed, 5 May 2021 09:02:07 +0000 (+0200) Subject: Some sonar stuff... X-Git-Tag: v3.28~328 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d52700ac49b5cf1b2629461c9f2807f3d04c9f39?hp=7636345391e90f6f243e68da98a641af136d1f77 Some sonar stuff... --- diff --git a/include/simgrid/kernel/routing/FatTreeZone.hpp b/include/simgrid/kernel/routing/FatTreeZone.hpp index 4ab2110952..43cb55b7d2 100644 --- a/include/simgrid/kernel/routing/FatTreeZone.hpp +++ b/include/simgrid/kernel/routing/FatTreeZone.hpp @@ -38,11 +38,11 @@ public: /** Links to the lower level, where the position in the vector corresponds to * a port number. */ - std::vector children; + std::vector> children; /** Links to the upper level, where the position in the vector corresponds to * a port number. */ - std::vector parents; + std::vector> parents; /** Virtual link standing for the node global capacity. */ @@ -115,9 +115,9 @@ class XBT_PRIVATE FatTreeZone : public ClusterZone { std::vector num_parents_per_node_; // number of parents by node std::vector num_port_lower_level_; // ports between each level l and l-1 - std::map compute_nodes_; - std::vector nodes_; - std::vector links_; + std::map> compute_nodes_; + std::vector> nodes_; + std::vector> links_; std::vector nodes_by_level_; void add_link(FatTreeNode* parent, unsigned int parent_port, FatTreeNode* child, unsigned int child_port); @@ -126,7 +126,7 @@ class XBT_PRIVATE FatTreeZone : public ClusterZone { void generate_labels(); int connect_node_to_parents(FatTreeNode* node); bool are_related(FatTreeNode* parent, FatTreeNode* child) const; - bool is_in_sub_tree(FatTreeNode* root, FatTreeNode* node) const; + bool is_in_sub_tree(const FatTreeNode* root, const FatTreeNode* node) const; void do_seal() override; @@ -134,7 +134,6 @@ public: using ClusterZone::ClusterZone; FatTreeZone(const FatTreeZone&) = delete; FatTreeZone& operator=(const FatTreeZone&) = delete; - ~FatTreeZone() override; void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; /** diff --git a/include/simgrid/kernel/routing/TorusZone.hpp b/include/simgrid/kernel/routing/TorusZone.hpp index 983a6bb04e..d657e845ca 100644 --- a/include/simgrid/kernel/routing/TorusZone.hpp +++ b/include/simgrid/kernel/routing/TorusZone.hpp @@ -24,7 +24,7 @@ class XBT_PRIVATE TorusZone : public ClusterZone { public: using ClusterZone::ClusterZone; - void create_links(int id, int rank, unsigned int position); + void create_torus_links(int id, int rank, unsigned int position); void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override; void set_topology(const std::vector& dimensions); diff --git a/include/simgrid/s4u/NetZone.hpp b/include/simgrid/s4u/NetZone.hpp index c100c59ebe..21c0606be3 100644 --- a/include/simgrid/s4u/NetZone.hpp +++ b/include/simgrid/s4u/NetZone.hpp @@ -190,9 +190,10 @@ struct ClusterCallbacks { std::function netpoint; std::function loopback = {}; std::function limiter = {}; - explicit ClusterCallbacks(std::function set_netpoint) : netpoint(set_netpoint){/*nothing to do */}; - ClusterCallbacks(std::function set_netpoint, std::function set_loopback, - std::function set_limiter) + explicit ClusterCallbacks(const std::function& set_netpoint) + : netpoint(set_netpoint){/*nothing to do */}; + ClusterCallbacks(const std::function& set_netpoint, + const std::function& set_loopback, const std::function& set_limiter) : netpoint(set_netpoint), loopback(set_loopback), limiter(set_limiter){/*nothing to do */}; }; /** diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index beb0ebfca4..aae4d8a87f 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -151,18 +151,25 @@ void DragonflyZone::build_upper_levels(const s4u::ClusterCallbacks& set_callback void DragonflyZone::generate_routers(const s4u::ClusterCallbacks& set_callbacks) { int id = 0; + /* get limiter for this router */ + auto get_limiter = [this, &id, &set_callbacks](unsigned int i, unsigned int j, + unsigned int k) -> resource::LinkImpl* { + kernel::resource::LinkImpl* limiter = nullptr; + if (set_callbacks.limiter) { + const auto* s4u_link = + set_callbacks.limiter(get_iface(), {i, j, k, std::numeric_limits::max()}, --id); + if (s4u_link) { + limiter = s4u_link->get_impl(); + } + } + return limiter; + }; + routers_.reserve(num_groups_ * num_chassis_per_group_ * num_blades_per_chassis_); for (unsigned int i = 0; i < num_groups_; i++) { for (unsigned int j = 0; j < num_chassis_per_group_; j++) { for (unsigned int k = 0; k < num_blades_per_chassis_; k++) { - resource::LinkImpl* limiter = nullptr; - if (set_callbacks.limiter) { - auto* s4u_link = - set_callbacks.limiter(get_iface(), {i, j, k, std::numeric_limits::max()}, --id); - if (s4u_link) - limiter = s4u_link->get_impl(); - } - routers_.emplace_back(i, j, k, limiter); + routers_.emplace_back(i, j, k, get_limiter(i, j, k)); } } } diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index 2aa3799fa5..ed86300819 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -22,15 +22,7 @@ namespace simgrid { namespace kernel { namespace routing { -FatTreeZone::~FatTreeZone() -{ - for (FatTreeNode const* node : this->nodes_) - delete node; - for (FatTreeLink const* link : this->links_) - delete link; -} - -bool FatTreeZone::is_in_sub_tree(FatTreeNode* root, FatTreeNode* node) const +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); @@ -60,12 +52,12 @@ void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, Route* into, dou auto searchedNode = this->compute_nodes_.find(src->id()); xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the source %s [%u] in the fat tree", src->get_cname(), src->id()); - FatTreeNode* source = searchedNode->second; + const FatTreeNode* source = searchedNode->second.get(); searchedNode = this->compute_nodes_.find(dst->id()); xbt_assert(searchedNode != this->compute_nodes_.end(), "Could not find the destination %s [%u] in the fat tree", dst->get_cname(), dst->id()); - FatTreeNode* destination = searchedNode->second; + const FatTreeNode* destination = searchedNode->second.get(); XBT_VERB("Get route and latency from '%s' [%u] to '%s' [%u] in a fat tree", src->get_cname(), src->id(), dst->get_cname(), dst->id()); @@ -78,7 +70,7 @@ void FatTreeZone::get_local_route(NetPoint* src, NetPoint* dst, Route* into, dou return; } - FatTreeNode* currentNode = source; + const FatTreeNode* currentNode = source; // up part while (not is_in_sub_tree(currentNode, destination)) { @@ -139,7 +131,7 @@ void FatTreeZone::build_upper_levels(const s4u::ClusterCallbacks& set_callbacks) // 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]); + connect_node_to_parents(nodes_[k].get()); k++; } } @@ -166,14 +158,14 @@ void FatTreeZone::do_seal() msgBuffer.str(""); msgBuffer << "Nodes are : "; - for (FatTreeNode const* node : this->nodes_) { + for (auto const& node : this->nodes_) { msgBuffer << node->id << "(" << node->level << "," << node->position << ") "; } XBT_DEBUG("%s", msgBuffer.str().c_str()); msgBuffer.clear(); msgBuffer << "Links are : "; - for (FatTreeLink const* link : this->links_) { + for (auto const& link : this->links_) { msgBuffer << "(" << link->up_node_->id << "," << link->down_node_->id << ") "; } XBT_DEBUG("%s", msgBuffer.str().c_str()); @@ -187,13 +179,13 @@ int FatTreeZone::connect_node_to_parents(FatTreeNode* node) 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++) { - if (this->are_related(*currentParentNode, node)) { + 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->num_port_lower_level_[level]); for (unsigned int j = 0; j < this->num_port_lower_level_[level]; j++) { - this->add_link(*currentParentNode, node->label[level] + j * this->num_children_per_node_[level], node, + 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++; @@ -263,25 +255,30 @@ void FatTreeZone::generate_switches(const s4u::ClusterCallbacks& set_callbacks) this->nodes_by_level_[i + 1] = nodesInThisLevel; } + /* 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; + 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->nodes_by_level_[i + 1]; j++) { - kernel::resource::LinkImpl* limiter = nullptr; - int id = --k; - if (set_callbacks.limiter) { - auto* s4u_link = set_callbacks.limiter(get_iface(), {i + 1, j}, id); - if (s4u_link) - limiter = s4u_link->get_impl(); - } - auto* newNode = new FatTreeNode(id, i + 1, j, limiter, nullptr); + int id = --k; + auto newNode = std::make_shared(id, i + 1, j, get_limiter(i, j, id), nullptr); 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) { newNode->parents.resize(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); } } } @@ -346,11 +343,11 @@ void FatTreeZone::add_processing_node(int id, resource::LinkImpl* limiter, resou { using std::make_pair; static int position = 0; - auto* newNode = new FatTreeNode(id, 0, position++, limiter, loopback); + auto newNode = std::make_shared(id, 0, position++, limiter, loopback); newNode->parents.resize(this->num_parents_per_node_[0] * this->num_port_lower_level_[0]); newNode->label.resize(this->levels_); this->compute_nodes_.insert(make_pair(id, newNode)); - this->nodes_.push_back(newNode); + this->nodes_.emplace_back(newNode); } void FatTreeZone::add_link(FatTreeNode* parent, unsigned int parentPort, FatTreeNode* child, unsigned int childPort) @@ -372,13 +369,13 @@ void FatTreeZone::add_link(FatTreeNode* parent, unsigned int parentPort, FatTree } uniqueId++; - auto* newLink = new FatTreeLink(child, parent, linkup->get_impl(), linkdown->get_impl()); + 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, @@ -484,7 +481,7 @@ void FatTreeZone::generate_dot_file(const std::string& filename) const xbt_assert(file.is_open(), "Unable to open file %s", filename.c_str()); file << "graph AsClusterFatTree {\n"; - for (FatTreeNode const* node : this->nodes_) { + for (auto const& node : this->nodes_) { file << node->id; if (node->id < 0) file << " [shape=circle];\n"; @@ -492,7 +489,7 @@ void FatTreeZone::generate_dot_file(const std::string& filename) const file << " [shape=hexagon];\n"; } - for (FatTreeLink const* link : this->links_) { + for (auto const& link : this->links_) { file << link->down_node_->id << " -- " << link->up_node_->id << ";\n"; } file << "}"; diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index c9c7299b3e..280febef27 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -20,7 +20,7 @@ namespace simgrid { namespace kernel { namespace routing { -void TorusZone::create_links(int id, int rank, unsigned int position) +void TorusZone::create_torus_links(int id, int rank, unsigned int 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 @@ -223,7 +223,7 @@ NetZone* create_torus_zone(const std::string& name, const NetZone* parent, const Link* loopback; zone->fill_leaf_from_cb(i, dimensions, set_callbacks, &netpoint, &loopback, &limiter); - zone->create_links(netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id())); + zone->create_torus_links(netpoint->id(), i, zone->node_pos_with_loopback_limiter(netpoint->id())); } return zone->get_iface();