X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3e1930727ccd7e298b558833c4fbc74c43ebcad..65dc5e18ada92df9d138177c059be127a10810f5:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 6bd87e00ca..5162f6806c 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -101,25 +101,19 @@ typedef struct s_onelink {
 /**
  * Routing logic
  */
-typedef struct s_routing_component *routing_component_t;
+typedef struct s_as *AS_t;
 
 typedef struct s_model_type {
   const char *name;
   const char *desc;
-  routing_component_t (*create) ();
-  void (*end) ();
-} s_model_type_t, *model_type_t;
+  AS_t (*create) ();
+  void (*end) (AS_t as);
+} s_routing_model_description_t, *routing_model_description_t;
 
 typedef struct s_route {
   xbt_dynar_t link_list;
 } s_route_t, *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_extended {
   s_route_t generic_route;
   char *src_gateway;
@@ -133,64 +127,63 @@ typedef enum {
   SURF_ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
 } e_surf_routing_hierarchy_t;
 
-typedef struct s_routing_component {
+typedef struct s_as {
   xbt_dict_t to_index;			/* char* -> network_element_t */
   xbt_dict_t bypassRoutes;		/* store bypass routes */
-  model_type_t routing;
+  routing_model_description_t routing;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;
-  struct s_routing_component *routing_father;
+  struct s_as *routing_father;
   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, route_extended_t e_route);
-   xbt_dynar_t(*get_onelink_routes) (routing_component_t rc);
-   e_surf_network_element_type_t(*get_network_element_type) (const char
-                                                             *name);
-   route_extended_t(*get_bypass_route) (routing_component_t rc,
-                                        const char *src, const char *dst);
-  void (*finalize) (routing_component_t rc);
+  route_extended_t(*get_route) (AS_t as, const char *src,
+                                const char *dst);
+  double(*get_latency) (AS_t as, const char *src,
+                        const char *dst, route_extended_t e_route);
+  xbt_dynar_t(*get_onelink_routes) (AS_t as);
+  e_surf_network_element_type_t(*get_network_element_type) (const char *name);
+  route_extended_t(*get_bypass_route) (AS_t as,
+                                       const char *src, const char *dst);
+  void (*finalize) (AS_t as);
   /* The parser calls the following functions to inform the routing models
    * that a new element is added to the AS currently built.
    *
    * Of course, only the routing model of this AS is informed, not every ones */
-  void (*parse_PU) (routing_component_t rc, const char *name); /* A host or a router, whatever */
-  void (*parse_AS) (routing_component_t rc, const char *name);
-  void (*parse_route) (routing_component_t rc, const char *src,
-                     const char *dst, name_route_extended_t route);
-  void (*parse_ASroute) (routing_component_t rc, const char *src,
-                       const char *dst, name_route_extended_t route);
-  void (*parse_bypassroute) (routing_component_t rc, const char *src,
+  void (*parse_PU) (AS_t as, const char *name); /* A host or a router, whatever */
+  void (*parse_AS) (AS_t as, const char *name);
+  void (*parse_route) (AS_t as, const char *src,
+                     const char *dst, route_extended_t route);
+  void (*parse_ASroute) (AS_t as, const char *src,
+                       const char *dst, route_extended_t route);
+  void (*parse_bypassroute) (AS_t as, const char *src,
                            const char *dst, route_extended_t e_route);
-} s_routing_component_t;
+} s_as_t;
 
 typedef struct s_network_element_info {
-  routing_component_t rc_component;
+  AS_t rc_component;
   e_surf_network_element_type_t rc_type;
 } s_network_element_info_t, *network_element_info_t;
 
 typedef int *network_element_t;
 
 struct s_routing_global {
-  routing_component_t root;
+  AS_t root;
   void *loopback;
   size_t size_of_link;
-  xbt_dynar_t(*get_route) (const char *src, const char *dst);
-  xbt_dynar_t(*get_route_or_null) (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);
   void (*get_route_latency)(const char *src, const char *dst,
                             xbt_dynar_t *route, double *latency, int cleanup);
   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_exit(void);
 XBT_PUBLIC(void) routing_register_callbacks(void);
 
+XBT_PUBLIC(xbt_dynar_t) routing_get_route(const char *src, const char *dst);
+
 /**
  * Resource protected methods
  */