Move the latency computation logic from surf models to the routing module.

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index bd6a157..fe5fbc4 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -111,6 +111,16 @@ typedef struct s_route {
   xbt_dynar_t link_list;
 } s_route_t, *route_t;
 
+typedef struct s_name_route {
+  xbt_dynar_t link_name_list;
+} s_name_route_t, *name_route_t;
+
+typedef struct s_name_route_extended {
+  s_route_t generic_route;
+  char *src_gateway;
+  char *dst_gateway;
+} s_name_route_extended_t, *name_route_extended_t;
+
 typedef struct s_route_limits {
   char *src_gateway;
   char *dst_gateway;
@@ -138,7 +148,8 @@ 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 to_index;                 /* char* -> network_element_t */
+  xbt_dict_t bypassRoutes;             /* store bypass routes */
   model_type_t routing;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;
@@ -146,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);
@@ -155,9 +168,9 @@ typedef struct s_routing_component {
   void (*set_processing_unit) (routing_component_t rc, const char *name);
   void (*set_autonomous_system) (routing_component_t rc, const char *name);
   void (*set_route) (routing_component_t rc, const char *src,
-                     const char *dst, route_t route);
+                     const char *dst, name_route_extended_t route);
   void (*set_ASroute) (routing_component_t rc, const char *src,
-                       const char *dst, route_extended_t route);
+                       const char *dst, name_route_extended_t route);
   void (*set_bypassroute) (routing_component_t rc, const char *src,
                            const char *dst, route_extended_t e_route);
 } s_routing_component_t;
@@ -175,14 +188,16 @@ struct s_routing_global {
   void *loopback;
   size_t size_of_link;
    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_pvoid_t get_link_latency_fun);
 
 /**
  * Resource protected methods