X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5fd318d5dbeff1318c525b08a139cb881daa6fa..20e79288d7f2509807c25b4c2aed721c8c6e1b52:/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 7433e7e23d..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) {
@@ -49,10 +52,14 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
                                           sg_platf_route_cbarg_t into,
                                           double *latency) {
   FatTreeNode *source, *destination, *currentNode;
+
   std::map<int, FatTreeNode*>::const_iterator tempIter;
+  
+if (dst->getRcType() == SURF_NETWORK_ELEMENT_ROUTER || src->getRcType() == SURF_NETWORK_ELEMENT_ROUTER) return;
 
   /* Let's find the source and the destination in our internal structure */
   tempIter = this->computeNodes.find(src->getId());
+
   // xbt_die -> assert
   if (tempIter == this->computeNodes.end()) {
     xbt_die("Could not find the source %s [%d] in the fat tree", src->getName(),
@@ -62,8 +69,10 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
   tempIter = this->computeNodes.find(dst->getId());
   if (tempIter == this->computeNodes.end()) {
     xbt_die("Could not find the destination %s [%d] in the fat tree",
-            src->getName(), src->getId());
+            dst->getName(), dst->getId());
   }
+
+
   destination = tempIter->second;
   
   XBT_VERB("Get route and latency from '%s' [%d] to '%s' [%d] in a fat tree",
@@ -76,9 +85,11 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
     if(latency) {
       *latency += source->loopback->getLatency();
     }
+    return;
   }
 
   currentNode = source;
+
   // up part
   while (!isInSubTree(currentNode, destination)) {
     int d, k; // as in d-mod-k
@@ -277,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++) {
@@ -392,6 +400,9 @@ void AsClusterFatTree::addLink(FatTreeNode *parent, unsigned int parentPort,
   child->parents[childPort] = newLink;
 
   this->links.push_back(newLink);
+
+  
+
 }
 
 void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t 
@@ -405,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