[route parsing] greatly streamline the generic_new_extended_route function

[simgrid.git] / src / surf / surf_routing_private.h

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index 9b356dd..5b357c8 100644 (file)
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -40,17 +40,17 @@ 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);
+    network_element_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
@@ -75,7 +75,6 @@ AS_t model_rulebased_create(void);      /* create structures for rulebased routi
 AS_t model_cluster_create(void);      /* create structures for cluster routing model */
 
 /* Pass info from the cluster parser to the cluster routing */
-void surf_routing_cluster_add_link(const char* host_id,surf_parsing_link_up_down_t info);
 void surf_routing_cluster_add_backbone(AS_t as, void* bb);
 
 /* ************************************************** */