[trace] merging instr_variables.c into instr_interface.c (code re-organization)

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 55dd9e2..cb7b4c4 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -12,12 +12,13 @@
 #include "xbt/log.h"
 #include "surf/surfxml_parse_private.h"
 #include "surf/random_mgr.h"
-#include "instr/private.h"
+#include "instr/instr_private.h"
 
 #define NO_MAX_DURATION -1.0
 
 /* user-visible parameters */
 extern double sg_tcp_gamma;
+extern double sg_sender_gap;
 extern double sg_latency_factor;
 extern double sg_bandwidth_factor;
 extern double sg_weight_S_parameter;
@@ -149,7 +150,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 +158,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 +191,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