X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6d64076cb863913f0443de9e191934756abdae9c..2393024691b60fb2054ced4a41d146759091136c:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index ad8bde924f..58340eaf67 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -107,8 +107,6 @@ typedef struct s_model_type {
   const char *name;
   const char *desc;
   routing_component_t (*create) ();
-  void (*load) ();
-  void (*unload) ();
   void (*end) ();
 } s_model_type_t, *model_type_t;
 
@@ -116,21 +114,12 @@ 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;
-} s_route_limits_t, *route_limits_t;
-
 typedef struct s_route_extended {
   s_route_t generic_route;
   char *src_gateway;
@@ -144,7 +133,6 @@ typedef enum {
   SURF_ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
 } e_surf_routing_hierarchy_t;
 
-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 bypassRoutes;		/* store bypass routes */
@@ -153,23 +141,26 @@ typedef struct s_routing_component {
   char *name;
   struct s_routing_component *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);
+  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);
-  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,
+  /* 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 (*set_ASroute) (routing_component_t rc, const char *src,
+  void (*parse_ASroute) (routing_component_t rc, const char *src,
                        const char *dst, name_route_extended_t route);
-  void (*set_bypassroute) (routing_component_t rc, const char *src,
+  void (*parse_bypassroute) (routing_component_t rc, const char *src,
                            const char *dst, route_extended_t e_route);
 } s_routing_component_t;
 
@@ -196,9 +187,8 @@ struct s_routing_global {
   xbt_dynar_t last_route;
 };
 
-XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback, double_f_cpvoid_t get_link_latency_fun);
-
-XBT_PUBLIC(void) routing_parse_Scluster(void);       /* cluster bypass */
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
+XBT_PUBLIC(void) routing_register_callbacks(void);
 
 /**
  * Resource protected methods