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

[simgrid.git] / src / surf / xml / platf_private.hpp

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index df823bb..a195303 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -23,6 +23,7 @@ typedef size_t yy_size_t;
 XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char *name);
 
 typedef enum {
+  SURF_CLUSTER_DRAGONFLY=3,
   SURF_CLUSTER_FAT_TREE=2,
   SURF_CLUSTER_FLAT = 1,
   SURF_CLUSTER_TORUS = 0
@@ -87,11 +88,11 @@ typedef struct s_sg_platf_peer_cbarg {
 typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t;
 typedef struct s_sg_platf_route_cbarg {
   bool symmetrical;
-  const char *src;
-  const char *dst;
+  sg_netcard_t src;
+  sg_netcard_t dst;
   sg_netcard_t gw_src;
   sg_netcard_t gw_dst;
-  std::vector<Link*> link_list;
+  std::vector<Link*> *link_list;
 } s_sg_platf_route_cbarg_t;
 
 typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t;
@@ -251,8 +252,8 @@ XBT_PRIVATE void sg_instr_AS_end(void);
 
 typedef struct s_surf_parsing_link_up_down *surf_parsing_link_up_down_t;
 typedef struct s_surf_parsing_link_up_down {
-  Link* link_up;
-  Link* link_down;
+  Link* linkUp;
+  Link* linkDown;
 } s_surf_parsing_link_up_down_t;