X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/045db1657e870c721be490b411868f4181a12ced..d0ffc37686edcc803601f76ab51fdfed5fc2f241:/src/surf/surf_routing_private.h

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index 6c2e754d13..18c6753995 100644
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -10,36 +10,37 @@
 #include <float.h>
 #include "internal_config.h"
 
-#include "surf_private.h"
+//#include "surf_private.h"
 #include "xbt/dynar.h"
 #include "xbt/str.h"
 #include "xbt/config.h"
 #include "xbt/graph.h"
 #include "xbt/set.h"
 #include "surf/surfxml_parse.h"
+#include "surf_routing.hpp"
 
 /* ************************************************************************** */
 /* ******************************* NO ROUTING ******************************* */
 /* Only save the AS tree, and forward calls to child ASes */
-AS_t model_none_create(void);
-AS_t model_none_create_sized(size_t childsize);
-void model_none_finalize(AS_t as);
+AsPtr model_none_create(void);
+AsPtr model_none_create_sized(size_t childsize);
+void model_none_finalize(AsPtr as);
 /* ************************************************************************** */
 /* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
-AS_t model_generic_create_sized(size_t childsize);
-void model_generic_finalize(AS_t as);
+AsPtr model_generic_create_sized(size_t childsize);
+void model_generic_finalize(AsPtr as);
 
-int generic_parse_PU(AS_t rc, sg_routing_edge_t elm);
-int generic_parse_AS(AS_t rc, sg_routing_edge_t elm);
-void generic_parse_bypassroute(AS_t rc, sg_platf_route_cbarg_t e_route);
+int generic_parse_PU(AsPtr rc, RoutingEdgePtr elm);
+int generic_parse_AS(AsPtr rc, RoutingEdgePtr elm);
+void generic_parse_bypassroute(AsPtr rc, sg_platf_route_cbarg_t e_route);
 
 /* ************************************************************************** */
 /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
 
-xbt_dynar_t generic_get_onelink_routes(AS_t rc);
-sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc,
-    sg_routing_edge_t src,
-    sg_routing_edge_t dst,
+xbt_dynar_t generic_get_onelink_routes(AsPtr rc);
+sg_platf_route_cbarg_t generic_get_bypassroute(AsPtr rc,
+    RoutingEdgePtr src,
+    RoutingEdgePtr dst,
     double *lat);
 
 /* ************************************************************************** */
@@ -50,51 +51,42 @@ sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc,
  * produced route */
 sg_platf_route_cbarg_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
                                    sg_platf_route_cbarg_t data, int preserve_order);
-AS_t
-generic_autonomous_system_exist(AS_t rc, char *element);
-AS_t
-generic_processing_units_exist(AS_t rc, char *element);
-void generic_src_dst_check(AS_t rc, sg_routing_edge_t src,
-    sg_routing_edge_t dst);
+AsPtr
+generic_autonomous_system_exist(AsPtr rc, char *element);
+AsPtr
+generic_processing_units_exist(AsPtr rc, char *element);
+void generic_src_dst_check(AsPtr rc, RoutingEdgePtr src,
+    RoutingEdgePtr dst);
 
 /* ************************************************************************** */
 /* *************************** FLOYD ROUTING ******************************** */
-AS_t model_floyd_create(void);  /* create structures for floyd routing model */
-void model_floyd_end(AS_t as);      /* finalize the creation of floyd routing model */
-void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route);
+AsPtr model_floyd_create(void);  /* create structures for floyd routing model */
+void model_floyd_end(AsPtr as);      /* finalize the creation of floyd routing model */
+void model_floyd_parse_route(AsPtr rc, sg_platf_route_cbarg_t route);
 
-/* ************************************************** */
-/* **************  Cluster ROUTING   **************** */
-typedef struct {
-  s_as_t generic_routing;
-  void *backbone;
-  void *loopback;
-  sg_routing_edge_t router;
-} s_as_cluster_t, *as_cluster_t;
-
-AS_t model_cluster_create(void);      /* create structures for cluster routing model */
+AsPtr model_cluster_create(void);      /* create structures for cluster routing model */
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */
-AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */
+AsPtr model_vivaldi_create(void);      /* create structures for vivaldi routing model */
 #define HOST_PEER(peername) bprintf("peer_%s", peername)
 #define ROUTER_PEER(peername) bprintf("router_%s", peername)
 #define LINK_PEER(peername) bprintf("link_%s", peername)
 
 /* ************************************************************************** */
 /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
-AS_t model_dijkstra_both_create(int cached);    /* create by calling dijkstra or dijkstracache */
-AS_t model_dijkstra_create(void);       /* create structures for dijkstra routing model */
-AS_t model_dijkstracache_create(void);  /* create structures for dijkstracache routing model */
-void model_dijkstra_both_end(AS_t as);      /* finalize the creation of dijkstra routing model */
-void model_dijkstra_both_parse_route (AS_t rc, sg_platf_route_cbarg_t route);
+AsPtr model_dijkstra_both_create(int cached);    /* create by calling dijkstra or dijkstracache */
+AsPtr model_dijkstra_create(void);       /* create structures for dijkstra routing model */
+AsPtr model_dijkstracache_create(void);  /* create structures for dijkstracache routing model */
+void model_dijkstra_both_end(AsPtr as);      /* finalize the creation of dijkstra routing model */
+void model_dijkstra_both_parse_route (AsPtr rc, sg_platf_route_cbarg_t route);
 
 /* ************************************************************************** */
 /* *************************** FULL ROUTING ********************************* */
-AS_t model_full_create(void);   /* create structures for full routing model */
-void model_full_end(AS_t as);       /* finalize the creation of full routing model */
+AsPtr model_full_create(void);   /* create structures for full routing model */
+void model_full_end(AsPtr as);       /* finalize the creation of full routing model */
 void model_full_set_route(  /* Set the route and ASroute between src and dst */
-    AS_t rc, sg_platf_route_cbarg_t route);
+    AsPtr rc, sg_platf_route_cbarg_t route);
 /* ************************************************************************** */
 /* ************************* GRAPH EXPORTING FUNCTIONS ********************** */
 xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);