Add Dragonfly topology. Use XC30's Cray description as a basis

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

diff --git a/src/surf/AsCluster.hpp b/src/surf/AsCluster.hpp
index ee2a718..80a93ff 100644 (file)
--- a/src/surf/AsCluster.hpp
+++ b/src/surf/AsCluster.hpp
@@ -13,23 +13,23 @@ namespace surf {
 
 class XBT_PRIVATE AsCluster: public AsImpl {
 public:
-  AsCluster(const char*name);
-  ~AsCluster();
+  explicit AsCluster(const char*name);
+  ~AsCluster() override;
 
-  virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
 
   virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
   virtual void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) {}
 
-  xbt_dynar_t upDownLinks_ = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
+  xbt_dynar_t privateLinks_ = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
 
   Link* backbone_ = nullptr;
   void *loopback_ = nullptr;
   NetCard *router_ = nullptr;
-  int has_limiter_ = 0;
-  int has_loopback_ = 0;
-  int nb_links_per_node_ = 1;
+  bool hasLimiter_  = false;
+  bool hasLoopback_ = false;
+  int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
 
 };