X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8920849a7384e11f01c3ec73d9b14783e478bbbc..b23f76c819d776be7e164c27102a3dd969ca2880:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 55dd9e2c63..77d50344c0 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -149,7 +149,6 @@ typedef enum {
 typedef struct s_routing_component *routing_component_t;
 typedef struct s_routing_component {
   xbt_dict_t to_index;			/* char* -> network_element_t */
-  xbt_dict_t parse_routes;      /* store data during the parse process */
   xbt_dict_t bypassRoutes;		/* store bypass routes */
   model_type_t routing;
   e_surf_routing_hierarchy_t hierarchy;
@@ -158,6 +157,8 @@ typedef struct s_routing_component {
   xbt_dict_t routing_sons;
    route_extended_t(*get_route) (routing_component_t rc, const char *src,
                                  const char *dst);
+   double(*get_latency) (routing_component_t rc, const char *src,
+                                 const char *dst);
    xbt_dynar_t(*get_onelink_routes) (routing_component_t rc);
    e_surf_network_element_type_t(*get_network_element_type) (const char
                                                              *name);
@@ -189,13 +190,14 @@ struct s_routing_global {
    xbt_dynar_t(*get_route) (const char *src, const char *dst);
    xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
    xbt_dynar_t(*get_onelink_routes) (void);
+   double (*get_latency) (const char *src, const char *dst);
    e_surf_network_element_type_t(*get_network_element_type) (const char
                                                              *name);
   void (*finalize) (void);
   xbt_dynar_t last_route;
 };
 
-XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun);
 
 /**
  * Resource protected methods