X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4895c3c3d812abc5ae8cce1d75580f7ed4bbf4f..5b2ffa67d0e82b06951b2619815db43bacfdb1f3:/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 40948d23cc..b2697d103d 100644
--- a/src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/src/surf/surf_routing_cluster_fat_tree.cpp
@@ -5,9 +5,18 @@
 #include <boost/algorithm/string/classification.hpp>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees");
 
-AsClusterFatTree::AsClusterFatTree() : levels(0) {}
+AS_t model_fat_tree_cluster_create(void)
+{
+  return new AsClusterFatTree();
+}
+
+AsClusterFatTree::AsClusterFatTree() : levels(0) {
+  XBT_DEBUG("Creating a new fat tree.");
+}
 
 AsClusterFatTree::~AsClusterFatTree() {
   for (unsigned int i = 0 ; i < this->nodes.size() ; i++) {
@@ -15,11 +24,88 @@ AsClusterFatTree::~AsClusterFatTree() {
   }
 }
 
+bool AsClusterFatTree::isInSubTree(FatTreeNode *root, FatTreeNode *node) {
+  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);
+  if (root->level <= node->level) {
+    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 ; 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,
                                           double *latency) {
-  // TODO
+  FatTreeNode *source, *destination, *currentNode;
+  std::vector<NetworkLink*> route;
+  std::map<int, FatTreeNode*>::const_iterator tempIter;
+  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(), src->getId());
+  }
+  source = tempIter->second;
+  tempIter = this->computeNodes.find(dst->getId());
+  if (tempIter == this->computeNodes.end()) {
+    xbt_die("Could not find the destination %s [%d] in the fat tree", dst->getName(), dst->getId());
+  }
+
+
+  destination = tempIter->second;
+  XBT_DEBUG("Get route and latency from '%s' [%d] to '%s' [%d] in a fat tree",
+            src->getName(), src->getId(), dst->getName(), dst->getId());
+
+  currentNode = source;
+
+  // up part
+  while (!isInSubTree(currentNode, destination)) {
+    int d, k; // as in d-mod-k
+    d = destination->position;
+
+    for (unsigned int i = 0 ; i < currentNode->level ; i++) {
+      d /= this->upperLevelNodesNumber[i];
+    }
+    k = this->upperLevelNodesNumber[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;
+  }
+  XBT_DEBUG("%d(%u,%u) is in the sub tree of %d(%u,%u).", destination->id, destination->level, destination->position, currentNode->id, currentNode->level, currentNode->position);
+  // Down part
+  while(currentNode != destination) {
+    for(unsigned int i = 0 ; i < currentNode->children.size() ; i++) {
+      if(i % this->lowerLevelNodesNumber[currentNode->level - 1] ==
+         destination->label[currentNode->level - 1]) {
+        route.push_back(currentNode->children[i]->downLink);
+        if(latency) {
+          *latency += currentNode->children[i]->downLink->getLatency();
+        }
+        currentNode = currentNode->children[i]->downNode;
+        XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id, destination->level, destination->position, currentNode->id, currentNode->level, currentNode->position);
+      }
+    }
+  }
+  
+  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
@@ -30,45 +116,108 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster){
     return;
   }
   this->generateSwitches();
+
+
+  if(XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+    std::stringstream msgBuffer;
+
+    msgBuffer << "We are creating a fat tree of " << this->levels << " levels "
+              << "with " << this->nodesByLevel[0] << " processing nodes";
+    for (unsigned int i = 1 ; i <= this->levels ; i++) {
+      msgBuffer << ", " << this->nodesByLevel[i] << " switches at level " << i;
+    }
+    XBT_DEBUG("%s", msgBuffer.str().c_str());
+    msgBuffer.str("");
+    msgBuffer << "Nodes are : ";
+
+    for (unsigned int i = 0 ;  i < this->nodes.size() ; i++) {
+      msgBuffer << this->nodes[i]->id << "(" << this->nodes[i]->level << ","
+                << this->nodes[i]->position << ") ";
+    }
+    XBT_DEBUG("%s", msgBuffer.str().c_str());
+  }
+
+
   this->generateLabels();
+
   unsigned int k = 0;
   // Nodes are totally ordered, by level and then by position, in this->nodes
   for (unsigned int i = 0 ; i < this->levels ; i++) {
     for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) {
-      if(i != this->levels - 1) {
-        for(unsigned int l = 0 ; l < this->nodesByLevel[i+1] ; l++) {
-          this->connectNodeToParents(cluster, this->nodes[k]);
-        }
-      }
-      k++;
+        this->connectNodeToParents(cluster, this->nodes[k]);
+        k++;
+    }
+  }
+  
+  if(XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+    std::stringstream msgBuffer;
+    msgBuffer << "Links are : ";
+    for (unsigned int i = 0 ; i < this->links.size() ; i++) {
+      msgBuffer << "(" << this->links[i]->upNode->id << ","
+                << this->links[i]->downNode->id << ") ";
     }
+    XBT_DEBUG("%s", msgBuffer.str().c_str());
   }
+
+
 }
 
 int AsClusterFatTree::connectNodeToParents(sg_platf_cluster_cbarg_t cluster,
                                            FatTreeNode *node) {
-  FatTreeNode* currentParentNode;
+  std::vector<FatTreeNode*>::iterator currentParentNode = this->nodes.begin();
   int connectionsNumber = 0;
   const int level = node->level;
-  currentParentNode = this->nodes[this->getLevelPosition(level + 1)];
-  for (unsigned int i = 0 ; i < this->nodesByLevel[level] ; i++ ) {
-    if(this->areRelated(currentParentNode, node)) {
-      this->addLink(cluster, currentParentNode, node->label[level + 1], node,
-                    currentParentNode->label[level + 1]);
+  XBT_DEBUG("We are connecting node %d(%u,%u) to his parents.",
+            node->id, node->level, node->position);
+  currentParentNode += this->getLevelPosition(level + 1);
+  for (unsigned int i = 0 ; i < this->nodesByLevel[level + 1] ; i++ ) {
+    if(this->areRelated(*currentParentNode, 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->lowerLevelPortsNumber[level]);
+      for (unsigned int j = 0 ; j < this->lowerLevelPortsNumber[level] ; j++) {
+      this->addLink(cluster, *currentParentNode, node->label[level] +
+                    j * this->lowerLevelNodesNumber[level], node,
+                    (*currentParentNode)->label[level] +
+                    j * this->upperLevelNodesNumber[level]);
+      }
       connectionsNumber++;
     }
+    ++currentParentNode;
   }
   return connectionsNumber;
 }
 
 
 bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) {
+  std::stringstream msgBuffer;
+
+  if(XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug)) {
+    msgBuffer << "Are " << child->id << "(" << child->level << ","
+              << child->position << ") <";
+
+    for (unsigned int i = 0 ; i < this->levels ; i++) {
+      msgBuffer << child->label[i] << ",";
+    }
+    msgBuffer << ">";
+    
+    msgBuffer << " and " << parent->id << "(" << parent->level
+              << "," << parent->position << ") <";
+    for (unsigned int i = 0 ; i < this->levels ; i++) {
+      msgBuffer << parent->label[i] << ",";
+    }
+    msgBuffer << ">";
+    msgBuffer << " related ? ";
+    XBT_DEBUG("%s", msgBuffer.str().c_str());
+    
+  }
   if (parent->level != child->level + 1) {
     return false;
   }
   
   for (unsigned int i = 0 ; i < this->levels; i++) {
-    if (parent->label[i] != child->label[i] && i != parent->level) {
+    if (parent->label[i] != child->label[i] && i + 1 != parent->level) {
       return false;
     }
   }
@@ -76,7 +225,8 @@ bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) {
 }
 
 void AsClusterFatTree::generateSwitches() {
-  this->nodesByLevel.resize(this->levels, 0);
+  XBT_DEBUG("Generating switches.");
+  this->nodesByLevel.resize(this->levels + 1, 0);
   unsigned int nodesRequired = 0;
 
   // We take care of the number of nodes by level
@@ -86,12 +236,13 @@ void AsClusterFatTree::generateSwitches() {
   }
 
      
-  if(this->nodesByLevel[0] < this->nodes.size()) {
-    surf_parse_error("There is not enough nodes to fit to the described topology."
-                     " Please check your platform description (We need %d nodes, we only got %zu)",
+  if(this->nodesByLevel[0] != this->nodes.size()) {
+    surf_parse_error("The number of provided nodes does not fit with the wanted topology."
+                     " Please check your platform description (We need %d nodes, we got %zu)",
                      this->nodesByLevel[0], this->nodes.size());
     return;
   }
+
   
   for (unsigned int i = 0 ; i < this->levels ; i++) {
     int nodesInThisLevel = 1;
@@ -110,57 +261,84 @@ void AsClusterFatTree::generateSwitches() {
 
 
   // If we have to many compute nodes, we ditch them
-  if (this->nodesByLevel[0] > this->nodes.size()) {
-    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
   int k = 0;
-  for (unsigned int i = 1 ; i < this->levels ; i++) {
-    for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) {
+  for (unsigned int i = 0 ; i < this->levels ; i++) {
+    for (unsigned int j = 0 ; j < this->nodesByLevel[i + 1] ; j++) {
       FatTreeNode* newNode;
-      newNode = new FatTreeNode(--k, i, j);
-      newNode->children.resize(this->lowerLevelNodesNumber[i]);
-      newNode->parents.resize(this->upperLevelNodesNumber[i]);
+      newNode = new FatTreeNode(--k, i + 1, j);
+      XBT_DEBUG("We create the switch %d(%d,%d)", newNode->id, newNode->level, newNode->position);
+      newNode->children.resize(this->lowerLevelNodesNumber[i] *
+                               this->lowerLevelPortsNumber[i]);
+      if (i != this->levels - 1) {
+        newNode->parents.resize(this->upperLevelNodesNumber[i + 1] * this->lowerLevelPortsNumber[i + 1]);
+      }
+      newNode->label.resize(this->levels);
       this->nodes.push_back(newNode);
     }
   }
 }
 
 void AsClusterFatTree::generateLabels() {
+  XBT_DEBUG("Generating labels.");
   // TODO : check if nodesByLevel and nodes are filled
-  for (unsigned int i = 0 ; i < this->levels ; i++) {
-    std::vector<int> maxLabel(this->nodesByLevel[i]);
-    std::vector<int> currentLabel(this->nodesByLevel[i], 0);
-    unsigned int k = 0;
-    for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) {
-      maxLabel[j] = j > i ?
-        this->lowerLevelNodesNumber[i] : this->upperLevelNodesNumber[i];
+  std::vector<int> maxLabel(this->levels);
+  std::vector<int> currentLabel(this->levels);
+  unsigned int k = 0;
+  for (unsigned int i = 0 ; i <= this->levels ; i++) {
+    currentLabel.assign(this->levels, 0);
+    for (unsigned int j = 0 ; j < this->levels ; j++) {
+      maxLabel[j] = j + 1 > i ?
+        this->lowerLevelNodesNumber[j] : this->upperLevelNodesNumber[j];
     }
     
     for (unsigned int j = 0 ; j < this->nodesByLevel[i] ; j++) {
+
+      if(XBT_LOG_ISENABLED(surf_route_fat_tree, xbt_log_priority_debug )) {
+        std::stringstream msgBuffer;
+
+        msgBuffer << "Assigning label <";
+        for (unsigned int l = 0 ; l < this->levels ; l++) {
+          msgBuffer << currentLabel[l] << ",";
+        }
+        msgBuffer << "> to " << k << " (" << i << "," << j <<")";
+        
+        XBT_DEBUG("%s", msgBuffer.str().c_str());
+      }
       this->nodes[k]->label.assign(currentLabel.begin(), currentLabel.end());
 
-      int remainder = 0;
+      bool remainder = true;
       
+      unsigned int pos = 0;
       do {
-        int pos = currentLabel.size() - 1;
-        remainder = ++currentLabel[pos] / maxLabel[pos];
-        currentLabel[pos] = currentLabel[pos] % maxLabel[pos];
-        --pos;
+        std::stringstream msgBuffer;
+
+        ++currentLabel[pos];
+        if (currentLabel[pos] >= maxLabel[pos]) {
+          currentLabel[pos] = 0;
+          remainder = true;
+        }
+        else {
+          remainder = false;
+        }
+        if (!remainder) {
+          pos = 0;
+        }
+        else {
+          ++pos;
+        }
       }
-      while(remainder != 0);
-        k++;
+      while(remainder && pos < this->levels);
+      k++;
     }
   }
 }
 
 
 int AsClusterFatTree::getLevelPosition(const unsigned  int level) {
-  if (level > this->levels - 1) {
+  if (level > this->levels) {
     // Well, that should never happen. Maybe should we throw instead.
     return -1;
   }
@@ -172,25 +350,29 @@ int AsClusterFatTree::getLevelPosition(const unsigned  int level) {
  return tempPosition;
 }
 
-void AsClusterFatTree::addComputeNodes(std::vector<int> const& id) {
-  for (size_t  i = 0 ; i < id.size() ; i++) {
-    this->nodes.push_back(new FatTreeNode(id[i]));
-  }
+void AsClusterFatTree::addProcessingNode(int id) {
+  using std::make_pair;
+  static int position = 0;
+  FatTreeNode* newNode;
+  newNode = new FatTreeNode(id, 0, position++);
+  newNode->parents.resize(this->upperLevelNodesNumber[0] * this->lowerLevelPortsNumber[0]);
+  newNode->label.resize(this->levels);
+  this->computeNodes.insert(make_pair(id,newNode));
+  this->nodes.push_back(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);
-
+  newLink = new FatTreeLink(cluster, child, parent);
+  XBT_DEBUG("Creating a link between the parent (%d,%d,%u)"
+            " and the child (%d,%d,%u)", parent->level, parent->position,
+            parentPort, child->level, child->position, childPort);
   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);
 
   
 
@@ -211,7 +393,7 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t
   }
 
   // The first parts of topo_parameters should be the levels number
-  this->levels = std::atoi(tmp[0].c_str()); // stoi() only in C++11...
+  this->levels = std::atoi(parameters[0].c_str()); // stoi() only in C++11...
   
   // Then, a l-sized vector standing for the childs number by level
   boost::split(tmp, parameters[1], boost::is_any_of(","));
@@ -254,13 +436,21 @@ void AsClusterFatTree::generateDotFile(const string& filename) const {
   file.open(filename.c_str(), ios::out | ios::trunc); 
   
   if(file.is_open()) {
-    // That could also be greatly clarified with C++11
-    std::map<std::pair<int,int>,FatTreeLink*>::const_iterator iter;
     file << "graph AsClusterFatTree {\n";
-    for (iter = this->links.begin() ; iter != this->links.end() ; iter++ ) {
-        file << iter->second->source->id
+    for (unsigned int i = 0 ; i < this->nodes.size() ; i++) {
+      file << this->nodes[i]->id;
+      if(this->nodes[i]->id < 0) {
+        file << " [shape=circle];\n";
+      }
+      else {
+        file << " [shape=hexagon];\n";
+      }
+    }
+
+    for (unsigned int i = 0 ; i < this->links.size() ; i++ ) {
+      file << this->links[i]->downNode->id
              << " -- "
-             << iter->second->destination->id
+           << this->links[i]->upNode->id
              << ";\n";
     }
     file << "}";
@@ -276,27 +466,33 @@ 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;
+  memset(&linkTemplate, 0, sizeof(linkTemplate));
   linkTemplate.bandwidth = cluster->bw;
   linkTemplate.latency = cluster->lat;
   linkTemplate.state = SURF_RESOURCE_ON;
   linkTemplate.policy = cluster->sharing_policy; // Maybe should we do sthg with that ?
-
-
-  NetworkLink* link;
-  linkTemplate.id = bprintf("link_from_%d_to_%d_%d_UP", source->id, destination->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);
+  linkTemplate.id = bprintf("link_from_%d_to_%d_%d", 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 ?
-
+  NetworkLink* link;
+  if (cluster->sharing_policy == SURF_LINK_FULLDUPLEX) {
+    std::string tmpID;
+    tmpID = std::string(linkTemplate.id) + "_UP";
+    link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(), SURF_LINK_LEVEL);
+    this->upLink = link; // check link?
+    tmpID = std::string(linkTemplate.id) + "_DOWN";
+    link = (NetworkLink*) xbt_lib_get_or_null(link_lib, tmpID.c_str(), SURF_LINK_LEVEL);
+    this->downLink = link; // check link ?
+  }
+  else {
+    link = (NetworkLink*) xbt_lib_get_or_null(link_lib, linkTemplate.id, SURF_LINK_LEVEL);
+    this->upLink = link;
+    this->downLink = link;
+  }
   uniqueId++;
-
+  
 }