NetCardImpl: automatic and ignorable field renamings

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

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 7fdd860..7b3ed8b 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -48,28 +48,27 @@ public:
  */
 class As {
 public:
-  xbt_dynar_t p_indexNetworkElm;
+  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;
-  As *p_routingFather;
-  xbt_dict_t p_routingSons;
-  NetCard *p_netElem;
-  xbt_dynar_t p_linkUpDownList;
+  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;
 
-  /**
-   * @brief The As constructor
-   */
   As(){};
+  /* Close that AS: no more content can be added to it */
+  virtual void Seal()=0;
 
-  /**
-   * @brief The As destructor
-   */
   virtual ~As(){
-       xbt_free(p_name);
-       if (p_netElem)
-               delete p_netElem;
+    xbt_dict_free(&p_routingSons);
+    xbt_dynar_free(&p_indexNetworkElm);
+    xbt_dynar_free(&p_linkUpDownList);
+    xbt_free(p_name);
+    if (p_netcard)
+      delete p_netcard;
   };
 
   /**
@@ -111,21 +110,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
@@ -145,10 +146,11 @@ public:
  */
 XBT_PUBLIC_CLASS RoutingPlatf {
 public:
+  RoutingPlatf(void *loopback);
   ~RoutingPlatf();
-  As *p_root;
+  As *p_root = nullptr;
   void *p_loopback;
-  xbt_dynar_t p_lastRoute;
+  xbt_dynar_t p_lastRoute = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
   xbt_dynar_t getOneLinkRoutes(void);
   xbt_dynar_t recursiveGetOneLinkRoutes(As *rc);
   void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency);
@@ -158,7 +160,7 @@ public:
  * Callbacks *
  *************/
 
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) routingEdgeCreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
 XBT_PUBLIC_DATA(simgrid::xbt::signal<void(As*)>) asCreatedCallbacks;
 
 }