X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eee21ec5f99218189fc98898a09150294cd0fbf4..5f9b13c6302e914a514168da8ff54818c0ee6787:/src/surf/surf_routing_dijkstra.hpp

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index ef683860d8..bcae26f09f 100644
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -1,3 +1,11 @@
+/* Copyright (c) 2013-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include <xbt/base.h>
+
 #include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
@@ -17,32 +25,50 @@ typedef struct route_cache_element {
   int size;
 } s_route_cache_element_t, *route_cache_element_t;
 
+namespace simgrid {
+namespace surf {
+
 /***********
  * Classes *
  ***********/
-class AsDijkstra;
-typedef AsDijkstra *AsDijkstraPtr;
+
+class XBT_PRIVATE AsDijkstra;
 
 class AsDijkstra : public AsGeneric {
 public:
   AsDijkstra();
-  AsDijkstra(int cached);
+  AsDijkstra(bool cached);
   ~AsDijkstra();
-	xbt_node_t routeGraphNewNode(int id, int graph_id);
-	graph_node_map_element_t nodeMapSearch(int id);
-	void newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route);
-	void addLoopback();
-	void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat);
-	xbt_dynar_t getOnelinkRoutes();
-	void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat);
-	void parseASroute(sg_platf_route_cbarg_t route);
-	void parseRoute(sg_platf_route_cbarg_t route);
-	void end();
-
-  xbt_graph_t p_routeGraph;      /* xbt_graph */
-  xbt_dict_t p_graphNodeMap;    /* map */
-  xbt_dict_t p_routeCache;       /* use in cache mode */
-  int m_cached;
+  xbt_node_t routeGraphNewNode(int id, int graph_id);
+  graph_node_map_element_t nodeMapSearch(int id);
+  void newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route);
+    /**
+     * For each vertex (node) already in the graph,
+     * make sure it also has a loopback link; this loopback
+     * can potentially already be in the graph, and in that
+     * case nothing will be done.
+     *
+     * If no loopback is specified for a node, we will use
+     * the loopback that is provided by the routing platform.
+     *
+     * After this function returns, any node in the graph
+     * will have a loopback attached to it.
+     */
+  void addLoopback();
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) override;
+  xbt_dynar_t getOneLinkRoutes() override;
+  void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat); // FIXME: this function is dangerously not overriding because of diverging prototype
+  void parseASroute(sg_platf_route_cbarg_t route) override;
+  void parseRoute(sg_platf_route_cbarg_t route) override;
+  void end();
+
+  xbt_graph_t p_routeGraph = nullptr;      /* xbt_graph */
+  xbt_dict_t p_graphNodeMap = nullptr;    /* map */
+  xbt_dict_t p_routeCache = nullptr;       /* use in cache mode */
+  bool m_cached = false;
 };
 
+}
+}
+
 #endif /* SURF_ROUTING_DIJKSTRA_HPP_ */