X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a22eb0ac7d22d5beaa6e33adf8f85c28dac59024..fa9f8bd4dce9b5c37e9c66ac09c9acc2e47e5bc3:/src/kernel/routing/DragonflyZone.hpp

diff --git a/src/kernel/routing/DragonflyZone.hpp b/src/kernel/routing/DragonflyZone.hpp
index 622945553f..2090b32233 100644
--- a/src/kernel/routing/DragonflyZone.hpp
+++ b/src/kernel/routing/DragonflyZone.hpp
@@ -12,22 +12,20 @@ namespace simgrid {
 namespace kernel {
 namespace routing {
 
-
 class XBT_PRIVATE DragonflyRouter {
-    public:
-      unsigned int group_;
-      unsigned int chassis_;
-      unsigned int blade_;
-      surf::Link** blueLinks_=nullptr;
-      surf::Link** blackLinks_=nullptr;
-      surf::Link** greenLinks_=nullptr;
-      surf::Link** myNodes_=nullptr;
-      DragonflyRouter(int i, int j, int k);
-      ~DragonflyRouter();
+public:
+  unsigned int group_;
+  unsigned int chassis_;
+  unsigned int blade_;
+  surf::Link** blueLinks_  = nullptr;
+  surf::Link** blackLinks_ = nullptr;
+  surf::Link** greenLinks_ = nullptr;
+  surf::Link** myNodes_    = nullptr;
+  DragonflyRouter(int i, int j, int k);
+  ~DragonflyRouter();
 };
 
-
-/** 
+/**
  * \class AsClusterDragonfly
  *
  * \brief Dragonfly representation and routing.
@@ -36,55 +34,58 @@ class XBT_PRIVATE DragonflyRouter {
  * Cray Cascade: a Scalable HPC System based on a Dragonfly Network
  * Greg Faanes, Abdulla Bataineh, Duncan Roweth, Tom Court, Edwin Froese,
  * Bob Alverson, Tim Johnson, Joe Kopnick, Mike Higgins and James Reinhard
- * Cray Inc, Chippewa Falls, Wisconsin, USA 
+ * Cray Inc, Chippewa Falls, Wisconsin, USA
  * or http://www.cray.com/sites/default/files/resources/CrayXCNetwork.pdf
  *
- * We use the same denomination for the different levels, with a Green, 
+ * We use the same denomination for the different levels, with a Green,
  * Black and Blue color scheme for the three different levels.
- * 
+ *
  * Description of the topology has to be given with a string of type :
  * "3,4;4,3;5,1;2"
  *
  * Last part  : "2"   : 2 nodes per blade
  * Third part : "5,1" : five blades/routers per chassis, with one link between each (green network)
- * Second part : "4,3" = four chassis per group, with three links between each nth router of each chassis (black network)
- * First part : "3,4" = three electrical groups, linked in an alltoall 
+ * Second part : "4,3" = four chassis per group, with three links between each nth router of each chassis (black
+ * network)
+ * First part : "3,4" = three electrical groups, linked in an alltoall
  * pattern by 4 links each (blue network)
  *
  * LIMITATIONS (for now):
  *  - Routing is only static and uses minimal routes.
- *  - When n links are used between two routers/groups, we consider only one link with n times the bandwidth (needs to be validated on a real system)
+ *  - When n links are used between two routers/groups, we consider only one link with n times the bandwidth (needs to
+ * be validated on a real system)
  *  - All links have the same characteristics for now
- *  - Blue links are all attached to routers in the chassis n°0. This limits 
+ *  - Blue links are all attached to routers in the chassis n°0. This limits
  *    the number of groups possible to the number of blades in a chassis. This
  *    is also not realistic, as blue level can use more links than a single
  *    Aries can handle, thus it should use several routers.
  */
-class XBT_PRIVATE AsClusterDragonfly
-  : public AsCluster {
-    public:
-      explicit AsClusterDragonfly(As* father, const char* name);
-      ~AsClusterDragonfly() override;
-//      void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) override;
-      void getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t into, double* latency) override;
-      void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) override;
-      void seal() override;
-      void generateRouters();
-      void generateLinks();
-      void createLink(char* id, int numlinks, Link** linkup, Link** linkdown);
-      unsigned int * rankId_to_coords(int rankId);
-    private:
-      sg_platf_cluster_cbarg_t cluster_;
-      unsigned int numNodesPerBlade_ = 0;
-      unsigned int numBladesPerChassis_ = 0;
-      unsigned int numChassisPerGroup_ = 0;
-      unsigned int numGroups_ = 0;
-      unsigned int numLinksGreen_ = 0;
-      unsigned int numLinksBlack_ = 0;
-      unsigned int numLinksBlue_ = 0;
-      unsigned int numLinksperLink_ = 1; //fullduplex -> 2, only for local link
-      DragonflyRouter** routers_=nullptr;
-    };
+class XBT_PRIVATE DragonflyZone : public ClusterZone {
+public:
+  explicit DragonflyZone(NetZone* father, const char* name);
+  ~DragonflyZone() override;
+  //      void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position) override;
+  void getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t into, double* latency) override;
+  void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) override;
+  void seal() override;
+  void generateRouters();
+  void generateLinks();
+  void createLink(char* id, int numlinks, Link** linkup, Link** linkdown);
+  unsigned int* rankId_to_coords(int rankId);
 
-}}}
+private:
+  sg_platf_cluster_cbarg_t cluster_;
+  unsigned int numNodesPerBlade_    = 0;
+  unsigned int numBladesPerChassis_ = 0;
+  unsigned int numChassisPerGroup_  = 0;
+  unsigned int numGroups_           = 0;
+  unsigned int numLinksGreen_       = 0;
+  unsigned int numLinksBlack_       = 0;
+  unsigned int numLinksBlue_        = 0;
+  unsigned int numLinksperLink_     = 1; // fullduplex -> 2, only for local link
+  DragonflyRouter** routers_        = nullptr;
+};
+}
+}
+}
 #endif