X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bdda1e97bd0162312e4b1d6c6d5b8ec18f4d9f7..3dbeba193df2e406bd9eff5be73c8bce0db0185e:/src/surf/surf_routing_cluster_fat_tree.cpp diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp index b32b6a6cbc..2421ea5496 100644 --- a/src/surf/surf_routing_cluster_fat_tree.cpp +++ b/src/surf/surf_routing_cluster_fat_tree.cpp @@ -22,6 +22,9 @@ AsClusterFatTree::~AsClusterFatTree() { 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 AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) { @@ -82,6 +85,7 @@ if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_ if(latency) { *latency += source->loopback->getLatency(); } + return; } currentNode = source; @@ -284,9 +288,6 @@ void AsClusterFatTree::generateSwitches() { } - // If we have to many compute nodes, we ditch them - - // We create the switches int k = 0; for (unsigned int i = 0 ; i < this->levels ; i++) { @@ -415,7 +416,6 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t if (parameters.size() != 4){ surf_parse_error("Fat trees are defined by the levels number and 3 vectors" ", see the documentation for more informations"); - // Well, there's no doc, yet } // The first parts of topo_parameters should be the levels number