Fix warning introduced by previous commit

[simgrid.git] / 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 8e55925..1c541d5 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/src/surf/surf_routing_cluster_fat_tree.cpp
@@ -7,6 +7,7 @@
 #include <fstream>
 
 
+
 AsClusterFatTree::AsClusterFatTree() : levels(0) {}
 
 AsClusterFatTree::~AsClusterFatTree() {
@@ -16,9 +17,20 @@ AsClusterFatTree::~AsClusterFatTree() {
 }
 
 bool AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) {
-  // stub
-  return false;
+  for (unsigned int i = 0 ; i < node->level ; i++) {
+    if(root->label[i] != node->label[i]) {
+      return false;
+    }
+  }
+  
+  for (unsigned int i = root->level + 1 ; i < this->levels ; i++) {
+    if(root->label[i] != node->label[i]) {
+      return false;
+    }
+  }
+  return true;
 }
+
 void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
                                           RoutingEdgePtr dst,
                                           sg_platf_route_cbarg_t into,
@@ -28,7 +40,7 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
   source = this->nodes.find(src->getId())->second;
   destination = this->nodes.find(dst->getId())->second;
 
-  int d, k; // as in d-mod-k
+  int d = 0, k = 0; // as in d-mod-k
 
   currentNode = source;
 
@@ -43,6 +55,9 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
       this->lowerLevelNodesNumber[currentNode->level];
      d = d % k;
      route.push_back(currentNode->parents[d]->upLink);
+     if(latency) {
+       *latency += currentNode->parents[d]->upLink->getLatency();
+     }
      currentNode = currentNode->parents[d]->upNode;
   }
   
@@ -52,10 +67,18 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
       if(i % this->lowerLevelNodesNumber[currentNode->level] ==
          destination->label[currentNode->level]) {
         route.push_back(currentNode->children[i]->downLink);
+        if(latency) {
+          *latency += currentNode->children[d]->downLink->getLatency();
+        }
         currentNode = currentNode->children[i]->downNode;
       }
     }
   }
+  
+  for (unsigned int i = 0 ; i < route.size() ; i++) {
+    xbt_dynar_push_as(into->link_list, void*, route[i]);
+  }
+
 }
 
 /* This function makes the assumption that parse_specific_arguments() and
@@ -343,4 +366,3 @@ FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *downNode
   uniqueId++;
 
 }
-