AS don't need a modelDesc. They have a C++ class

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

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 6096197..7a2a2a3 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -50,13 +50,12 @@ class As {
 public:
   xbt_dynar_t p_indexNetworkElm = xbt_dynar_new(sizeof(char*),NULL);
   xbt_dict_t p_bypassRoutes;    /* store bypass routes */
-  routing_model_description_t p_modelDesc;
   e_surf_routing_hierarchy_t p_hierarchy;
   char *p_name = nullptr;
   As *p_routingFather = nullptr;
   xbt_dict_t p_routingSons = xbt_dict_new_homogeneous(NULL);
   NetCard *p_netcard;
-  xbt_dynar_t p_linkUpDownList = NULL;
+  xbt_dynar_t p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
 
   As(){};
   /* Close that AS: no more content can be added to it */
@@ -110,21 +109,23 @@ public:
 
 struct XBT_PRIVATE NetCardImpl : public NetCard {
 public:
-  NetCardImpl(char *name, int id, e_surf_network_element_type_t rcType, As *rcComponent)
-  : p_rcComponent(rcComponent), p_rcType(rcType), m_id(id), p_name(name) {}
-  ~NetCardImpl() { xbt_free(p_name);};
-
-  int getId() {return m_id;}
-  int *getIdPtr() {return &m_id;}
-  void setId(int id) {m_id = id;}
-  char *getName() {return p_name;}
-  As *getRcComponent() {return p_rcComponent;}
-  e_surf_network_element_type_t getRcType() {return p_rcType;}
+  NetCardImpl(const char *name, e_surf_network_element_type_t componentType, As *component)
+  : component_(component),
+    componentType_(componentType),
+    name_(xbt_strdup(name)) {}
+  ~NetCardImpl() { xbt_free(name_);};
+
+  int getId() {return id_;}
+  int *getIdPtr() {return &id_;}
+  void setId(int id) {id_ = id;}
+  char *getName() {return name_;}
+  As *getRcComponent() {return component_;}
+  e_surf_network_element_type_t getRcType() {return componentType_;}
 private:
-  As *p_rcComponent;
-  e_surf_network_element_type_t p_rcType;
-  int m_id;
-  char *p_name;
+  As *component_;
+  e_surf_network_element_type_t componentType_;
+  int id_ = -1;
+  char *name_;
 };
 
 /** @ingroup SURF_routing_interface