X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..c46c0b0d1e605253fa05ccf16251d1a753b3fec7:/src/surf/surf_routing.hpp

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 3650cf8b1a..6877e4c958 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -10,7 +10,7 @@
 #ifndef NETWORK_ROUTING_HPP_
 #define NETWORK_ROUTING_HPP_
 
-void routing_model_create( void *loopback);
+XBT_PUBLIC(void) routing_model_create( void *loopback);
 
 /* ************************************************************************** */
 /* ************************* GRAPH EXPORTING FUNCTIONS ********************** */
@@ -21,37 +21,25 @@ xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xb
  * Classes *
  ***********/
 
-/* Note: As and RoutingEdge are declard as struct instead of class, to keep
-   compatibility with C files where they are mentioned. */
-struct As;
-typedef As *AsPtr;
-
+class As;
 class RoutingModelDescription;
-typedef RoutingModelDescription *RoutingModelDescriptionPtr;
-
-struct RoutingEdge;
-typedef RoutingEdge *RoutingEdgePtr;
-
 class Onelink;
-typedef Onelink *OnelinkPtr;
-
 class RoutingPlatf;
-typedef RoutingPlatf *RoutingPlatfPtr;
 
 /** @ingroup SURF_routing_interface
  * @brief The Autonomous System (AS) routing interface
  * @details [TODO]
  */
-struct As {
+class As {
 public:
   xbt_dynar_t p_indexNetworkElm;
   xbt_dict_t p_bypassRoutes;    /* store bypass routes */
   routing_model_description_t p_modelDesc;
   e_surf_routing_hierarchy_t p_hierarchy;
   char *p_name;
-  AsPtr p_routingFather;
+  As *p_routingFather;
   xbt_dict_t p_routingSons;
-  RoutingEdgePtr p_netElem;
+  RoutingEdge *p_netElem;
   xbt_dynar_t p_linkUpDownList;
 
   /**
@@ -67,7 +55,7 @@ public:
   };
 
   /**
-   * @brief Get the route and latency between two RoutingEdgs
+   * @brief Get the route and latency between two RoutingEdges
    * @details [long description]
    * 
    * @param src [description]
@@ -75,17 +63,17 @@ public:
    * @param into [description]
    * @param latency [description]
    */
-  virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency)=0;
+  virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *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(RoutingEdgePtr src, RoutingEdgePtr dst, double *lat)=0;
+  virtual sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *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(RoutingEdgePtr elm)=0; /* A host or a router, whatever */
-  virtual int parseAS( RoutingEdgePtr elm)=0;
+  virtual int parsePU(RoutingEdge *elm)=0; /* A host or a router, whatever */
+  virtual int parseAS( RoutingEdge *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;
@@ -102,13 +90,13 @@ public:
   virtual int *getIdPtr()=0;
   virtual void setId(int id)=0;
   virtual char *getName()=0;
-  virtual AsPtr getRcComponent()=0;
+  virtual As *getRcComponent()=0;
   virtual e_surf_network_element_type_t getRcType()=0;
 };
 
 struct RoutingEdgeImpl : public RoutingEdge {
 public:
-  RoutingEdgeImpl(char *name, int id, e_surf_network_element_type_t rcType, AsPtr rcComponent)
+  RoutingEdgeImpl(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);};
 
@@ -116,10 +104,10 @@ public:
   int *getIdPtr() {return &m_id;}
   void setId(int id) {m_id = id;}
   char *getName() {return p_name;}
-  AsPtr getRcComponent() {return p_rcComponent;}
+  As *getRcComponent() {return p_rcComponent;}
   e_surf_network_element_type_t getRcType() {return p_rcType;}
 private:
-  AsPtr p_rcComponent;
+  As *p_rcComponent;
   e_surf_network_element_type_t p_rcType;
   int m_id;
   char *p_name;
@@ -133,7 +121,7 @@ public:
   int *getIdPtr() {return p_re->getIdPtr();}
   void setId(int id) {p_re->setId(id);}
   char *getName() {return p_re->getName();}
-  AsPtr getRcComponent() {return p_re->getRcComponent();}
+  As *getRcComponent() {return p_re->getRcComponent();}
   e_surf_network_element_type_t getRcType() {return p_re->getRcType();}
 private:
   RoutingEdge *p_re;
@@ -144,25 +132,25 @@ private:
  */
 class Onelink {
 public:
-  Onelink(void *link, RoutingEdgePtr src, RoutingEdgePtr dst)
+  Onelink(void *link, RoutingEdge *src, RoutingEdge *dst)
     : p_src(src), p_dst(dst), p_link(link) {};
-  RoutingEdgePtr p_src;
-  RoutingEdgePtr p_dst;
+  RoutingEdge *p_src;
+  RoutingEdge *p_dst;
   void *p_link;
 };
 
 /** @ingroup SURF_routing_interface
  * @brief The class representing a whole routing platform
  */
-class RoutingPlatf {
+XBT_PUBLIC_CLASS RoutingPlatf {
 public:
   ~RoutingPlatf();
-  AsPtr p_root;
+  As *p_root;
   void *p_loopback;
   xbt_dynar_t p_lastRoute;
   xbt_dynar_t getOneLinkRoutes(void);
-  xbt_dynar_t recursiveGetOneLinkRoutes(AsPtr rc);
-  void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_t * links, double *latency);
+  xbt_dynar_t recursiveGetOneLinkRoutes(As *rc);
+  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, xbt_dynar_t * links, double *latency);
 };
 
 #endif /* NETWORK_ROUTING_HPP_ */