move one method higher in As hierarchy

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

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index e7242e8..8b30f5f 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -36,7 +36,6 @@ class NetCard {
 public:
   virtual ~NetCard(){};
   virtual int id()=0; // Our rank in the vertices_ array of our containing AS.
-  virtual int *getIdPtr()=0;
   virtual void setId(int id)=0;
   virtual char *name()=0;
   virtual As *containingAS()=0; // This is the AS in which I am
@@ -44,28 +43,29 @@ public:
 };
 
 /** @ingroup SURF_routing_interface
- * @brief The Autonomous System (AS) routing interface
+ * @brief Network Autonomous System (AS)
  * @details [TODO]
  */
 class As {
 public:
   As(const char*name);
   /** @brief Close that AS: no more content can be added to it */
-  virtual void Seal()=0;
+  virtual void Seal();
   virtual ~As();
 
-  char *name_ = nullptr;
-  NetCard *netcard_ = nullptr;
-  As *father_ = nullptr;
-  xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL);
-
-  xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
-  xbt_dict_t bypassRoutes_ = nullptr;
   e_surf_routing_hierarchy_t hierarchy_ = SURF_ROUTING_NULL;
   xbt_dynar_t upDownLinks = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
 
+  char *name_ = nullptr;
+  NetCard *netcard_ = nullptr; // Our representative in the father AS
+  As *father_ = nullptr;
+  xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
+  xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
 
+private:
+  bool sealed_ = false; // We cannot add more content when sealed
 
+public:
   /**
    * @brief Probe the routing path between two points
    *
@@ -92,7 +92,7 @@ public:
    */
   virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency)=0;
   /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */
-  virtual xbt_dynar_t getOneLinkRoutes()=0;
+  virtual xbt_dynar_t getOneLinkRoutes();
 
   virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)=0;
 
@@ -100,7 +100,7 @@ public:
 
   /* Add content to the AS, at parsing time. It should be sealed afterward. */
   virtual int addComponent(NetCard *elm); /* A host, a router or an AS, whatever */
-  virtual void parseRoute(sg_platf_route_cbarg_t route);
+  virtual void addRoute(sg_platf_route_cbarg_t route);
   virtual void parseBypassroute(sg_platf_route_cbarg_t e_route);
 };
 
@@ -113,12 +113,11 @@ public:
   {}
   ~NetCardImpl() { xbt_free(name_);};
 
-  int id() {return id_;}
-  int *getIdPtr() {return &id_;}
-  void setId(int id) {id_ = id;}
-  char *name() {return name_;}
-  As *containingAS() {return containingAS_;}
-  e_surf_network_element_type_t getRcType() {return componentType_;}
+  int id()           override {return id_;}
+  void setId(int id) override {id_ = id;}
+  char *name()       override {return name_;}
+  As *containingAS() override {return containingAS_;}
+  e_surf_network_element_type_t getRcType() override {return componentType_;}
 private:
   int id_ = -1;
   char *name_;
@@ -132,10 +131,10 @@ private:
 class Onelink {
 public:
   Onelink(void *link, NetCard *src, NetCard *dst)
-    : p_src(src), p_dst(dst), p_link(link) {};
-  NetCard *p_src;
-  NetCard *p_dst;
-  void *p_link;
+    : src_(src), dst_(dst), link_(link) {};
+  NetCard *src_;
+  NetCard *dst_;
+  void *link_;
 };
 
 /** @ingroup SURF_routing_interface
@@ -145,11 +144,10 @@ XBT_PUBLIC_CLASS RoutingPlatf {
 public:
   RoutingPlatf(void *loopback);
   ~RoutingPlatf();
-  As *p_root = nullptr;
-  void *p_loopback;
-  xbt_dynar_t p_lastRoute = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
+  As *root_ = nullptr;
+  void *loopback_;
+  xbt_dynar_t lastRoute_ = xbt_dynar_new(sizeof(Link*),NULL);
   xbt_dynar_t getOneLinkRoutes(void);
-  xbt_dynar_t recursiveGetOneLinkRoutes(As *rc);
   void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency);
 };