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

diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp
index 294fe2b5ab..bd2da0a5ec 100644
--- a/src/surf/surf_routing_cluster.hpp
+++ b/src/surf/surf_routing_cluster.hpp
@@ -1,52 +1,50 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* 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. */
 
+#ifndef SURF_ROUTING_CLUSTER_HPP_
+#define SURF_ROUTING_CLUSTER_HPP_
+
+#include <xbt/base.h>
+
 #include "surf_routing_none.hpp"
 #include "network_interface.hpp"
 
-#ifndef SURF_ROUTING_CLUSTER_HPP_
-#define SURF_ROUTING_CLUSTER_HPP_
+namespace simgrid {
+namespace surf {
 
 /***********
  * Classes *
  ***********/
-class AsCluster;
-typedef AsCluster *AsClusterPtr;
 
+class XBT_PRIVATE AsCluster;
 
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
 
 class AsCluster: public AsNone {
 public:
-  AsCluster();
-
-  virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr 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(RoutingEdgePtr src, RoutingEdgePtr 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(RoutingEdgePtr elm); /* A host or a router, whatever */
-  int parseAS(RoutingEdgePtr 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);
-  NetworkLinkPtr p_backbone;
-  void *p_loopback;
-  RoutingEdgePtr 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;
 
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_CLUSTER_HPP_ */