X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..564a883b3d816d2c5d227f5311d248ef799b5190:/src/surf/surf_routing_cluster.hpp?ds=sidebyside

diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp
index 4588624f5f..b3f283a8a4 100644
--- a/src/surf/surf_routing_cluster.hpp
+++ b/src/surf/surf_routing_cluster.hpp
@@ -9,8 +9,9 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_none.hpp"
+#include "surf_routing.hpp"
 #include "network_interface.hpp"
+#include "simgrid/s4u/as.hpp"
 
 namespace simgrid {
 namespace surf {
@@ -24,31 +25,23 @@ class XBT_PRIVATE AsCluster;
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
 
-class AsCluster: public AsNone {
+class AsCluster: public s4u::As {
 public:
-  AsCluster();
-
-  virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
-  //xbt_dynar_t getOneLinkRoutes();
-  //void parseRoute(sg_platf_route_cbarg_t route);
-  //void parseASroute(sg_platf_route_cbarg_t route);
-
-  void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
-  //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *dst, double *lat);
-
-  /* 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 */
-  int parsePU(RoutingEdge *elm); /* A host or a router, whatever */
-  int parseAS(RoutingEdge *elm);
+  AsCluster(const char*name);
+
+  virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
+
   virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position);
-  Link* p_backbone;
-  void *p_loopback;
-  RoutingEdge *p_router;
-  int p_has_limiter;
-  int p_has_loopback;
-  int p_nb_links_per_node;
+  virtual void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) {}
+
+
+  Link* backbone_ = nullptr;
+  void *loopback_ = nullptr;
+  NetCard *router_ = nullptr;
+  int has_limiter_ = 0;
+  int has_loopback_ = 0;
+  int nb_links_per_node_ = 1;
 
 };