X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..dad398b4437e937d222bafff987814b8f2d80409:/src/surf/surf_routing.hpp

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 5e42bc20d0..721888dfbf 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -27,12 +27,12 @@ class XBT_PRIVATE Onelink;
 class RoutingPlatf;
 
 /** @ingroup SURF_routing_interface
- * @brief A routing edge
- * @details [long description]
+ * @brief A network card
+ * @details This represents a position in the network. One can route information between two netcards
  */
-class RoutingEdge {
+class NetCard {
 public:
-  virtual ~RoutingEdge(){};
+  virtual ~NetCard(){};
   virtual int getId()=0;
   virtual int *getIdPtr()=0;
   virtual void setId(int id)=0;
@@ -54,7 +54,7 @@ public:
   char *p_name;
   As *p_routingFather;
   xbt_dict_t p_routingSons;
-  RoutingEdge *p_netElem;
+  NetCard *p_netElem;
   xbt_dynar_t p_linkUpDownList;
 
   /**
@@ -81,30 +81,30 @@ public:
    * @param latency [description]
    */
   virtual void getRouteAndLatency(
-    RoutingEdge *src, RoutingEdge *dst,
+    NetCard *src, NetCard *dst,
     sg_platf_route_cbarg_t into, double *latency)=0;
   virtual xbt_dynar_t getOneLinkRoutes()=0;
   virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)=0;
   virtual sg_platf_route_cbarg_t getBypassRoute(
-    RoutingEdge *src, RoutingEdge *dst,
+    NetCard *src, NetCard *dst,
     double *lat)=0;
 
   /* The parser calls the following functions to inform the routing models
    * that a new element is added to the AS currently built.
    *
    * Of course, only the routing model of this AS is informed, not every ones */
-  virtual int parsePU(RoutingEdge *elm)=0; /* A host or a router, whatever */
-  virtual int parseAS(RoutingEdge *elm)=0;
+  virtual int parsePU(NetCard *elm)=0; /* A host or a router, whatever */
+  virtual int parseAS(NetCard *elm)=0;
   virtual void parseRoute(sg_platf_route_cbarg_t route)=0;
   virtual void parseASroute(sg_platf_route_cbarg_t route)=0;
   virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 };
 
-struct XBT_PRIVATE RoutingEdgeImpl : public RoutingEdge {
+struct XBT_PRIVATE NetCardImpl : public NetCard {
 public:
-  RoutingEdgeImpl(char *name, int id, e_surf_network_element_type_t rcType, As *rcComponent)
+  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) {}
-  ~RoutingEdgeImpl() { xbt_free(p_name);};
+  ~NetCardImpl() { xbt_free(p_name);};
 
   int getId() {return m_id;}
   int *getIdPtr() {return &m_id;}
@@ -119,29 +119,15 @@ private:
   char *p_name;
 };
 
-struct RoutingEdgeWrapper : public RoutingEdge {
-public:
-  RoutingEdgeWrapper(RoutingEdge *re) : p_re(re){}
-  ~RoutingEdgeWrapper(){}
-  int getId() {return p_re->getId();}
-  int *getIdPtr() {return p_re->getIdPtr();}
-  void setId(int id) {p_re->setId(id);}
-  char *getName() {return p_re->getName();}
-  As *getRcComponent() {return p_re->getRcComponent();}
-  e_surf_network_element_type_t getRcType() {return p_re->getRcType();}
-private:
-  RoutingEdge *p_re;
-};
-
 /** @ingroup SURF_routing_interface
  * @brief Link of lenght 1, alongside with its source and destination. This is mainly usefull in the ns3 bindings
  */
 class Onelink {
 public:
-  Onelink(void *link, RoutingEdge *src, RoutingEdge *dst)
+  Onelink(void *link, NetCard *src, NetCard *dst)
     : p_src(src), p_dst(dst), p_link(link) {};
-  RoutingEdge *p_src;
-  RoutingEdge *p_dst;
+  NetCard *p_src;
+  NetCard *p_dst;
   void *p_link;
 };
 
@@ -156,15 +142,15 @@ public:
   xbt_dynar_t p_lastRoute;
   xbt_dynar_t getOneLinkRoutes(void);
   xbt_dynar_t recursiveGetOneLinkRoutes(As *rc);
-  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, xbt_dynar_t * links, double *latency);
+  void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency);
 };
 
 /*************
  * Callbacks *
  *************/
 
-XBT_PUBLIC_DATA(surf_callback(void, RoutingEdge*)) routingEdgeCreatedCallbacks;
-XBT_PUBLIC_DATA(surf_callback(void, As*)) asCreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::surf::signal<void(NetCard*)>) routingEdgeCreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::surf::signal<void(As*)>) asCreatedCallbacks;
 
 }
 }