const char *desc;
routing_component_t (*create) ();
void (*end) ();
-} s_model_type_t, *model_type_t;
+} 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;
typedef struct s_routing_component {
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;
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);
/* The parser calls the following functions to inform the routing models
* that a new element is added to the AS currently built.
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);
+ const char *dst, route_extended_t route);
void (*parse_ASroute) (routing_component_t rc, const char *src,
- const char *dst, name_route_extended_t route);
+ const char *dst, route_extended_t route);
void (*parse_bypassroute) (routing_component_t rc, const char *src,
const char *dst, route_extended_t e_route);
} s_routing_component_t;