Add some routing for the fat trees

Unsign some ints

diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp
index 19ecc12..8e55925 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/src/surf/surf_routing_cluster_fat_tree.cpp
@@ -15,11 +15,47 @@ AsClusterFatTree::~AsClusterFatTree() {
   }
 }
 
+bool AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) {
+  // stub
+  return false;
+}
 void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src,
                                           RoutingEdgePtr dst,
                                           sg_platf_route_cbarg_t into,
                                           double *latency) {
+  FatTreeNode *source, *destination, *currentNode;
+  std::vector<NetworkLink*> route;
+  source = this->nodes.find(src->getId())->second;
+  destination = this->nodes.find(dst->getId())->second;
+
+  int d, k; // as in d-mod-k
+
+  currentNode = source;
+
+  // up part
+  while (!isInSubTree(currentNode, destination)) {
+    d = destination->position;
+
+    for (unsigned int i = 0 ; i < currentNode->level ; i++) {
+      d /= this->upperLevelNodesNumber[i];
+    }
+     k = this->upperLevelNodesNumber[currentNode->level] *
+      this->lowerLevelNodesNumber[currentNode->level];
+     d = d % k;
+     route.push_back(currentNode->parents[d]->upLink);
+     currentNode = currentNode->parents[d]->upNode;
+  }
   
+  // Down part
+  while(currentNode != destination) {
+    for(unsigned int i = 0 ; i < currentNode->children.size() ; i++) {
+      if(i % this->lowerLevelNodesNumber[currentNode->level] ==
+         destination->label[currentNode->level]) {
+        route.push_back(currentNode->children[i]->downLink);
+        currentNode = currentNode->children[i]->downNode;
+      }
+    }
+  }
 }
 
 /* This function makes the assumption that parse_specific_arguments() and
@@ -118,7 +154,6 @@ void AsClusterFatTree::generateSwitches() {
     for (unsigned int i = this->nodesByLevel[0] ; i < this->nodes.size() ; i++) {
       delete this->nodes[i];
     }
-    this->nodes.resize(this->nodesByLevel[0]);
   }
 
   // We create the switches
@@ -132,7 +167,7 @@ void AsClusterFatTree::generateSwitches() {
       if (i != this->levels - 1) {
         newNode->parents.resize(this->upperLevelNodesNumber[i + 1]);
       }
-      this->nodes.push_back(newNode);
+      this->nodes.insert(std::make_pair(k,newNode));
     }
   }
 }
@@ -180,27 +215,25 @@ int AsClusterFatTree::getLevelPosition(const unsigned  int level) {
 }
 
 void AsClusterFatTree::addComputeNodes(std::vector<int> const& id) {
+  using std::make_pair;
   FatTreeNode* newNode;
   for (size_t  i = 0 ; i < id.size() ; i++) {
     newNode = new FatTreeNode(id[i], 0, i);
     newNode->parents.resize(this->upperLevelNodesNumber[0] * this->lowerLevelPortsNumber[i]);
-    this->nodes.push_back(newNode);
+    this->nodes.insert(make_pair(id[i],newNode));
   }
 }
 
 void AsClusterFatTree::addLink(sg_platf_cluster_cbarg_t cluster, 
                                FatTreeNode *parent, unsigned int parentPort,
                                FatTreeNode *child, unsigned int childPort) {
-  using std::make_pair;
-
-
   FatTreeLink *newLink;
   newLink = new FatTreeLink(cluster, parent, child);
 
   parent->children[parentPort] = newLink;
   child->parents[childPort] = newLink;
 
-  this->links.insert(make_pair(make_pair(parent->id, child->id), newLink));
+  this->links.push_back(newLink);
 
   
 
@@ -265,12 +298,12 @@ void AsClusterFatTree::generateDotFile(const string& filename) const {
   
   if(file.is_open()) {
     // That could also be greatly clarified with C++11
-    std::map<std::pair<int,int>,FatTreeLink*>::const_iterator iter;
+    std::vector<FatTreeLink*>::const_iterator iter;
     file << "graph AsClusterFatTree {\n";
     for (iter = this->links.begin() ; iter != this->links.end() ; iter++ ) {
-        file << iter->second->source->id
+      file << (*iter)->downNode->id
              << " -- "
-             << iter->second->destination->id
+           << (*iter)->upNode->id
              << ";\n";
     }
     file << "}";
@@ -286,9 +319,9 @@ FatTreeNode::FatTreeNode(int id, int level, int position) : id(id),
                                                             level(level),
                                                             position(position){}
 
-FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source,
-                         FatTreeNode *destination) : source(source),
-                                                     destination(destination) {
+FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *downNode,
+                         FatTreeNode *upNode) : upNode(upNode),
+                                                downNode(downNode) {
   static int uniqueId = 0;
   s_sg_platf_link_cbarg_t linkTemplate;
   linkTemplate.bandwidth = cluster->bw;
@@ -298,15 +331,16 @@ FatTreeLink::FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source,
 
 
   NetworkLink* link;
-  linkTemplate.id = bprintf("link_from_%d_to_%d_%d_UP", source->id, destination->id, uniqueId);
+  linkTemplate.id = bprintf("link_from_%d_to_%d_%d_UP", downNode->id, upNode->id, uniqueId);
   sg_platf_new_link(&linkTemplate);
   link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL);
-  this->linkUp = link; // check link?
-  linkTemplate.id = bprintf("link_from_%d_to_%d_%d_DOWN", source->id, destination->id, uniqueId);
+  this->upLink = link; // check link?
+  linkTemplate.id = bprintf("link_from_%d_to_%d_%d_DOWN", downNode->id, upNode->id, uniqueId);
   sg_platf_new_link(&linkTemplate);
   link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL);
-  this->linkDown = link; // check link ?
+  this->downLink = link; // check link ?
 
   uniqueId++;
 
 }
+

diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp
index fa63eb4..edc48f1 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -23,12 +23,13 @@
 class FatTreeNode;
 class FatTreeLink;
 
+
 class FatTreeNode {
 public:
   int id;
   unsigned int level; // The 0th level represents the leafs of the PGFT
   unsigned int position; // Position in the level
-  std::vector<int> label;
+  std::vector<unsigned int> label;
   /* We can see the sizes sum of the two following vectors as the device 
    * ports number. If we use the notations used in Zahavi's paper, 
    * children.size() = m_level and parents.size() = w_(level+1)
@@ -47,13 +48,11 @@ public:
   /* Links are dependant of the chosen network model, but must implement 
    * NetworkLink
    */
-  NetworkLink* linkUp; // From source to destination
-  NetworkLink* linkDown; // From destination to source
-  /* As it is symetric, it might as well be first / second instead
-   * of source / destination
-   */
-  FatTreeNode *source; 
-  FatTreeNode *destination;
+  NetworkLink *upLink; 
+  NetworkLink *downLink;
+  FatTreeNode *upNode;
+  FatTreeNode *downNode;
+  
 };
 
 class AsClusterFatTree : public AsCluster {
@@ -74,12 +73,12 @@ public:
 protected:
   //description of a PGFT (TODO : better doc)
   unsigned int levels;
-  std::vector<int> lowerLevelNodesNumber; // number of children by node
-  std::vector<int> upperLevelNodesNumber; // number of parents by node
-  std::vector<int> lowerLevelPortsNumber; // ports between each level l and l-1
+  std::vector<unsigned int> lowerLevelNodesNumber; // number of children by node
+  std::vector<unsigned int> upperLevelNodesNumber; // number of parents by node
+  std::vector<unsigned int> lowerLevelPortsNumber; // ports between each level l and l-1
   
-  std::vector<FatTreeNode*> nodes;
-  std::map<std::pair<int,int>, FatTreeLink*> links;
+  std::map<int, FatTreeNode*> nodes;
+  std::vector<FatTreeLink*> links;
   std::vector<unsigned int> nodesByLevel;
 
   void addLink(sg_platf_cluster_cbarg_t cluster, 
@@ -90,5 +89,6 @@ protected:
   void generateSwitches();
   int connectNodeToParents(sg_platf_cluster_cbarg_t cluster, FatTreeNode *node);
   bool areRelated(FatTreeNode *parent, FatTreeNode *child);
+  bool isInSubTree(FatTreeNode *root, FatTreeNode *node);
 };
 #endif