[Bug Fix] Resolve compilation error introduced in 20984b0bb3a1e3e5e213963d9182b1c15ba...

Some minor progresses have been made in the implementation of fat trees

diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp
index 44fa45b..ffdfc37 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/src/surf/surf_routing_cluster_fat_tree.cpp
@@ -30,7 +30,7 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) {
   if(this->levels == 0) {
     return;
   }
   if(this->levels == 0) {
     return;
   }

-  std::vector<int> nodesByLevel(this->levels); 
+  this->nodesByLevel.resize(this->levels, 0);

   int nodesRequired = 0;
 
 
   int nodesRequired = 0;
 
 


@@ -45,35 +45,43 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster) {
         nodesInThisLevel *= this->lowerLevelNodesNumber[j];
       }
 
         nodesInThisLevel *= this->lowerLevelNodesNumber[j];
       }
 

-      nodesByLevel[i] = nodesInThisLevel;
+      this->nodesByLevel[i] = nodesInThisLevel;

       nodesRequired += nodesInThisLevel;
     }
    
     if(nodesRequired > this->nodes.size()) {
       nodesRequired += nodesInThisLevel;
     }
    
     if(nodesRequired > 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 %lu)", nodesRequired, 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 %lu)",
+                       nodesRequired, this->nodes.size());

       return;
     }
 
     // Nodes are totally ordered, by level and then by position, in this->nodes
     int k = 0;
     for (int i = 0 ; i < this->levels ; i++) {
       return;
     }
 
     // Nodes are totally ordered, by level and then by position, in this->nodes
     int k = 0;
     for (int i = 0 ; i < this->levels ; i++) {

-      for (int j = 0 ; j < nodesByLevel[i] ; j++) {
+      for (int j = 0 ; j < this->nodesByLevel[i] ; j++) {

         this->nodes[k]->level = i;
         this->nodes[k]->position = j;
         this->nodes[k]->level = i;
         this->nodes[k]->position = j;

-
-        if (i == 0) {
-          
-        }
-        else if (i == this->levels - 1) {
-          
-        }
-        else {
-          
-        }

       }
     }
       }
     }

+
+    

 }
 
 }
 

+void AsClusterFatTree::getLevelPosition(const int level, int &position, int &size) {
+  if (level > this->levels - 1) {
+    position = -1;
+    size =  -1;
+    return;
+  }
+  int tempPosition = 0;
+
+  for (int i = 0 ; i < level ; i++) {
+    tempPosition += this->nodesByLevel[i];
+  }
+  position = tempPosition;
+  size = this->nodesByLevel[level];
+}

 
 void AsClusterFatTree::addNodes(std::vector<int> const& id) {
   for (int i = 0 ; i < id.size() ; i++) {
 
 void AsClusterFatTree::addNodes(std::vector<int> const& id) {
   for (int i = 0 ; i < id.size() ; i++) {


@@ -81,6 +89,31 @@ void AsClusterFatTree::addNodes(std::vector<int> const& id) {
   }
 }
 
   }
 }
 

+void AsClusterFatTree::addLink(FatTreeNode *parent, FatTreeNode *child) {
+  using std::make_pair;
+  if (parent->children.size() == this->nodesByLevel[parent->level] ||
+      child->parents.size()   == this->nodesByLevel[child->level]) {
+    /* NB : This case should never happen, if this private function is not misused,
+     * so should we keep this test, keep it only for debug, throw an exception
+     * or get rid of it ? In all cases, anytime we get in there, code should be
+     * fixed
+     */
+    xbt_die("I've been asked to create a link that could not possibly exist");
+    return;
+  }
+
+  parent->children.push_back(child);
+  child->parents.push_back(parent);
+
+  // FatTreeLink *newLink;
+
+  // newLink = new FatTreeLink(parent, child, this->lowerLevelPortsNumber[parent->level]);
+  // this->links.insert(make_pair(make_pair(parent->id, child->id), newLink));
+
+  
+
+}
+

 void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t 
                                                 cluster) {
   std::vector<string> parameters;
 void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t 
                                                 cluster) {
   std::vector<string> parameters;


@@ -131,7 +164,7 @@ void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t
 }
 
 
 }
 
 

-void AsClusterFatTree::generateDotFile(string filename) {
+void AsClusterFatTree::generateDotFile(const string& filename) const {

   ofstream file;
   /* Maybe should we get directly a char*, as open takes strings only beginning
    * with C++11...
   ofstream file;
   /* Maybe should we get directly a char*, as open takes strings only beginning
    * with C++11...


@@ -140,16 +173,16 @@ void AsClusterFatTree::generateDotFile(string filename) {
   
   if(file.is_open()) {
     // That could also be greatly clarified with C++11
   
   if(file.is_open()) {
     // That could also be greatly clarified with C++11

-    std::map<std::pair<int,int>,FatTreeLink*>::iterator iter;
-    file << "graph AsClusterFatTree {\n";
-    for (iter = this->links.begin() ; iter != this->links.end() ; iter++ ) {
-      for (int j = 0 ; j < iter->second->ports ; j++) {
-        file << iter->second->source.id 
-             << " -- " 
-             << iter->second->destination.id
-             << ";\n";
-      }
-    }
+    // std::map<std::pair<int,int>,FatTreeLink*>::iterator iter;
+    // file << "graph AsClusterFatTree {\n";
+    // for (iter = this->links.begin() ; iter != this->links.end() ; iter++ ) {
+    //   for (int j = 0 ; j < iter->second->ports ; j++) {
+    //     file << iter->second->source->id 
+    //          << " -- " 
+    //          << iter->second->destination->id
+    //          << ";\n";
+    //   }
+    //}

     file << "}";
     file.close();
   }
     file << "}";
     file.close();
   }


@@ -162,3 +195,9 @@ void AsClusterFatTree::generateDotFile(string filename) {
 FatTreeNode::FatTreeNode(int id, int level, int position) : id(id),
                                                             level(level),
                                                             position(position){}
 FatTreeNode::FatTreeNode(int id, int level, int position) : id(id),
                                                             level(level),
                                                             position(position){}

+
+// FatTreeLink::FatTreeLink(FatTreeNode *source, FatTreeNode *destination,
+//                          int ports) : source(source), destination(destination),
+//                                       ports(ports) {
+  
+// }

diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp
index 1c8a865..1c39826 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -17,9 +17,10 @@
  * should certainly be checked for)
  */
 
  * should certainly be checked for)
  */
 

+

 class FatTreeNode {
 public:
 class FatTreeNode {
 public:

-  int id; // ID as given by the user
+  int id; // ID as given by the user, should be unique

   int level; // The 0th level represents the leafs of the PGFT
   int position; // Position in the level
   
   int level; // The 0th level represents the leafs of the PGFT
   int position; // Position in the level
   


@@ -36,22 +37,30 @@ public:
 class FatTreeLink {
 public:
   unsigned int ports;
 class FatTreeLink {
 public:
   unsigned int ports;

-  std::vector<NetworkLink> linksUp; // From source to destination
-  std::vector<NetworkLink> linksDown; // From destination to source
-  FatTreeNode source;
-  FatTreeNode destination;
-  FatTreeLink(int source, int destination, unsigned int ports = 0);
+  std::vector<s_sg_platf_link_cbarg_t> linksUp; // From source to destination
+  std::vector<s_sg_platf_link_cbarg_t> linksDown; // From destination to source
+  /* As it is symetric, it might as well be first / second instead
+   * of source / destination
+   */
+  FatTreeNode *source; 
+  FatTreeNode *destination;
+  //FatTreeLink(FatTreeNode *source, FatTreeNode *destination, unsigned int ports = 0);

 };
 
 class AsClusterFatTree : public AsCluster {
 public:
   AsClusterFatTree();
   ~AsClusterFatTree();
 };
 
 class AsClusterFatTree : public AsCluster {
 public:
   AsClusterFatTree();
   ~AsClusterFatTree();

-  virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency) const;
+  virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
+                                  sg_platf_route_cbarg_t into,
+                                  double *latency) const;
+  // virtual void getRouteAndLatency(const int src, const int dst,
+  //                                 std::vector<NetworkLink> *route,
+  //                                 double *latency) const;

   virtual void create_links(sg_platf_cluster_cbarg_t cluster);
   void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster);
   void addNodes(std::vector<int> const& id);
   virtual void create_links(sg_platf_cluster_cbarg_t cluster);
   void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster);
   void addNodes(std::vector<int> const& id);

-  void generateDotFile(string filename = "fatTree.dot");
+  void generateDotFile(const string& filename = "fatTree.dot") const;

 
 protected:
   //description of a PGFT (TODO : better doc)
 
 protected:
   //description of a PGFT (TODO : better doc)


@@ -62,9 +71,9 @@ protected:
   
   std::vector<FatTreeNode*> nodes;
   std::map<std::pair<int,int>, FatTreeLink*> links;
   
   std::vector<FatTreeNode*> nodes;
   std::map<std::pair<int,int>, FatTreeLink*> links;

-  
-};
+  std::vector<int> nodesByLevel;

 
 

-
-  
+  void addLink(FatTreeNode *parent, FatTreeNode *child);
+  void getLevelPosition(const int level, int &position, int &size);
+};

 #endif
 #endif