Completely remove parse_routes table.

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 2483f30..9d52382 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -111,6 +111,16 @@ 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;
@@ -139,7 +149,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;
@@ -157,9 +166,9 @@ typedef struct s_routing_component {
   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,
-                     const char *dst, route_t route);
+                     const char *dst, name_route_extended_t route);
   void (*set_ASroute) (routing_component_t rc, const char *src,
-                       const char *dst, route_extended_t route);
+                       const char *dst, name_route_extended_t route);
   void (*set_bypassroute) (routing_component_t rc, const char *src,
                            const char *dst, route_extended_t e_route);
 } s_routing_component_t;