Merge branch 'master' into MC_LTL

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index b527e5c..17bd311 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -132,10 +132,8 @@ typedef struct s_as {
   struct s_as *routing_father;
   xbt_dict_t routing_sons;
 
-  void (*get_route) (AS_t as, const char *src, const char *dst, route_t into);
-  double(*get_latency) (AS_t as,
-                        const char *src, const char *dst,
-                        route_t e_route);
+  void (*get_route_and_latency) (AS_t as, const char *src, const char *dst, route_t into, double *latency);
+
   xbt_dynar_t(*get_onelink_routes) (AS_t as);
   route_t(*get_bypass_route) (AS_t as, const char *src, const char *dst);
   void (*finalize) (AS_t as);
@@ -166,6 +164,7 @@ struct s_routing_global {
   AS_t root;
   void *loopback;
   size_t size_of_link;
+  xbt_dynar_t last_route;
   xbt_dynar_t(*get_onelink_routes) (void);
 };