X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b531b916a0eae7de729c2f1e99d050dbcb3ebba..3736e0252d96679e19cfbe41f3c09833d3734386:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 323885f5b3..d8a993cc96 100644
--- 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,7 +164,6 @@ struct s_routing_global {
   AS_t root;
   void *loopback;
   size_t size_of_link;
-  xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
   xbt_dynar_t(*get_onelink_routes) (void);
 };
 
@@ -174,11 +171,11 @@ XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
 XBT_PUBLIC(void) routing_exit(void);
 XBT_PUBLIC(void) routing_register_callbacks(void);
 XBT_PUBLIC(void) generic_free_route(route_t route); // FIXME rename to routing_route_free
+ // FIXME: make previous function private to routing again?
 
 
-XBT_PUBLIC(xbt_dynar_t) routing_get_route(const char *src, const char *dst);
-XBT_PUBLIC(void) routing_get_route_and_latency(const char *src, const char *dst, //FIXME too much functions avail?
-                              xbt_dynar_t * route, double *latency, int cleanup);
+XBT_PUBLIC(void) routing_get_route_and_latency(const char *src, const char *dst,
+                              xbt_dynar_t * route, double *latency);
 
 /**
  * Resource protected methods