X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9740a26f7f05adb6289f0db8c01007ee1394fb5e..af16855f0556e92be92366d8adec26f179967e21:/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 1c39826b4b..fa63eb4a8e 100644
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -17,34 +17,43 @@
  * should certainly be checked for)
  */
 
+/* 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<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:
-  unsigned int ports;
-  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
+  FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source,
+              FatTreeNode *destination);
+  //  unsigned int ports;
+  /* 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;
-  //FatTreeLink(FatTreeNode *source, FatTreeNode *destination, unsigned int ports = 0);
 };
 
 class AsClusterFatTree : public AsCluster {
@@ -53,27 +62,33 @@ public:
   ~AsClusterFatTree();
   virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
                                   sg_platf_route_cbarg_t into,
-                                  double *latency) const;
+                                  double *latency);
   // 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);
+  void addComputeNodes(std::vector<int> const& id);
   void generateDotFile(const string& filename = "fatTree.dot") const;
 
 protected:
   //description of a PGFT (TODO : better doc)
   unsigned int levels;
-  std::vector<int> lowerLevelNodesNumber;
-  std::vector<int> upperLevelNodesNumber;
-  std::vector<int> lowerLevelPortsNumber;
+  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<FatTreeNode*> nodes;
   std::map<std::pair<int,int>, FatTreeLink*> links;
-  std::vector<int> nodesByLevel;
+  std::vector<unsigned int> nodesByLevel;
 
-  void addLink(FatTreeNode *parent, FatTreeNode *child);
-  void getLevelPosition(const 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);
 };
 #endif