X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/efd5719fdcd06a99d1fd644b81c7e9d578c08fc5..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/surf_routing.hpp

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index c5d0d5db2e..c3801295dd 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -48,15 +48,15 @@ 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
@@ -67,28 +67,39 @@ public:
    * @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;
   };
 
   /**
-   * @brief Get the route and latency between two RoutingEdges
-   * @details [long description]
+   * @brief Get the characteristics of the routing path between two points
+   *
+   * This function is used by the networking model to find the information it needs when starting a communication.
+   *
+   * The things are not straightforward because the platform can be routed using several routing models.
+   * Some ASes may be routed in full, others may have only some connection information and use a shortest path on top of that, and so on.
+   * Some ASes may even not have any predefined links and use only coordinate informations to compute the latency.
+   *
+   * So, the path is constructed recursively, with each traversed AS adding its information to the set.
+   * The algorithm for that is explained in http://hal.inria.fr/hal-00650233/
    * 
-   * @param src [description]
-   * @param dst [description]
-   * @param into [description]
-   * @param latency [description]
+   * @param src Initial point of the routing path
+   * @param dst Final point of the routing path
+   * @param into Container into which the links should be pushed
+   * @param latency Accumulator in which the latencies should be added
    */
   virtual void getRouteAndLatency(
-    NetCard *src, NetCard *dst,
-    sg_platf_route_cbarg_t into, double *latency)=0;
+      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(
-    NetCard *src, NetCard *dst,
-    double *lat)=0;
+      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.
@@ -150,7 +161,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;
 
 }