X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae8140f19db6cb86f753e32499eab49190846d1f..4d834c6f7709971355b0ff9d29cde677c2e8af02:/src/surf/surf_routing_private.h

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index 7a1e3dc5b9..112a13dea2 100644
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -29,8 +29,8 @@ void model_none_finalize(AS_t as);
 AS_t model_generic_create_sized(size_t childsize);
 void model_generic_finalize(AS_t as);
 
-int generic_parse_PU(AS_t rc, network_element_t elm);
-int generic_parse_AS(AS_t rc, network_element_t elm);
+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, const char *src, const char *dst,
                                route_t e_route);
 
@@ -39,24 +39,24 @@ void generic_parse_bypassroute(AS_t rc, const char *src, const char *dst,
 
 xbt_dynar_t generic_get_onelink_routes(AS_t rc);
 route_t generic_get_bypassroute(AS_t rc,
-    network_element_t src,
-    network_element_t dst);
+    sg_routing_edge_t src,
+    sg_routing_edge_t dst,
+    double *lat);
 
 /* ************************************************************************** */
 /* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */
 
-route_t
-generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
-                           void *data, int order);
-route_t
-generic_new_route(e_surf_routing_hierarchy_t hierarchy,
-                           void *data, int order);
+/* change a route containing link names into a route containing link entities.
+ * If change_order is true, the links are put in reverse order in the
+ * produced route */
+route_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
+                                   route_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, network_element_t src,
-    network_element_t dst);
+void generic_src_dst_check(AS_t rc, sg_routing_edge_t src,
+    sg_routing_edge_t dst);
 
 
 /* ************************************************************************** */
@@ -72,18 +72,19 @@ AS_t model_rulebased_create(void);      /* create structures for rulebased routi
 
 /* ************************************************** */
 /* **************  Cluster ROUTING   **************** */
-AS_t model_cluster_create(void);      /* create structures for cluster routing model */
+typedef struct {
+  s_as_t generic_routing;
+  void *backbone;
+} s_as_cluster_t, *as_cluster_t;
 
-/* Pass info from the cluster parser to the cluster routing */
-void surf_routing_cluster_add_backbone(AS_t as, void* bb);
+AS_t model_cluster_create(void);      /* create structures for cluster routing model */
 
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */
 AS_t 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_UP_PEER(peername) bprintf("link_%s_up", peername)
-#define LINK_DOWN_PEER(peername) bprintf("link_%s_down", peername)
+#define LINK_PEER(peername) bprintf("link_%s", peername)
 
 /* ************************************************************************** */
 /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
@@ -98,8 +99,8 @@ void model_dijkstra_both_parse_route (AS_t rc, const char *src,
 /* *************************** 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 */
-void model_full_set_route(	/* Set the route and ASroute between src and dst */
-		AS_t rc, const char *src, const char *dst, route_t route);
+void model_full_set_route(  /* Set the route and ASroute between src and dst */
+    AS_t rc, const char *src, const char *dst, route_t route);
 
 
 #endif                          /* _SURF_SURF_ROUTING_PRIVATE_H */