Lots of bugfixes for the fat trees, it should at least not crash when using it

[simgrid.git] / src / surf / surf_routing_cluster_fat_tree.hpp

diff --git a/src/surf/surf_routing_cluster_fat_tree.hpp b/src/surf/surf_routing_cluster_fat_tree.hpp
index 62f9354..addb37e 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -20,38 +20,39 @@
 /* TODO : limiter link ? Loopback?
  *
  */
+class FatTreeNode;
+class FatTreeLink;
+
 
 class FatTreeNode {
 public:
-  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 id;
+  unsigned int level; // The 0th level represents the leafs of the PGFT
+  unsigned int position; // Position in the level
+  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)
    * 
    */
-  std::vector<FatTreeNode*> children;  // m, apply from lvl 0 to levels - 1 
-  std::vector<FatTreeNode*> parents; // w, apply from lvl 1 to levels
+  std::vector<FatTreeLink*> children;  // m, apply from lvl 0 to levels - 1 
+  std::vector<FatTreeLink*> parents; // w, apply from lvl 1 to levels
   FatTreeNode(int id, int level=-1, int position=-1);
 };
 
 class FatTreeLink {
 public:
   FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source,
-              FatTreeNode *destination, unsigned int ports = 0);
-  unsigned int ports;
+              FatTreeNode *destination);
+  //  unsigned int ports;
   /* Links are dependant of the chosen network model, but must implement 
    * NetworkLink
    */
-   std::vector<NetworkLink*> linksUp; // From source to destination
-  std::vector<NetworkLink*> linksDown; // 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 {
@@ -66,22 +67,29 @@ public:
   //                                 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);
+  void addProcessingNode(int id);
   void generateDotFile(const string& filename = "fatTree.dot") const;
 
-protected:
+private:
   //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::map<int, FatTreeNode*> computeNodes;
   std::vector<FatTreeNode*> nodes;
-  std::map<std::pair<int,int>, FatTreeLink*> links;
+  std::vector<FatTreeLink*> links;
   std::vector<unsigned int> nodesByLevel;
 
-  void addLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *parent,
-               FatTreeNode *child);
-  void getLevelPosition(const unsigned int level, int *position, int *size);
+  void addLink(sg_platf_cluster_cbarg_t cluster, 
+               FatTreeNode *parent, unsigned int parentPort,
+               FatTreeNode *child, unsigned int childPort);
+  int getLevelPosition(const unsigned int level);
+  void generateLabels();
+  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