-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 */
- model_type_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);
- 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,
- const char *dst, name_route_extended_t route);
- void (*set_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,
- const char *dst, route_extended_t e_route);
-} s_routing_component_t;
-
-typedef struct s_network_element_info {
- routing_component_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;
- 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, double_f_cpvoid_t get_link_latency_fun);
-
-XBT_PUBLIC(void) routing_parse_Scluster(void); /* cluster bypass */
+XBT_PUBLIC(void) routing_model_create(void *loopback);
+XBT_PUBLIC(void) routing_exit(void);
+XBT_PUBLIC(void) storage_register_callbacks(void);
+
+XBT_PRIVATE void routing_new_cluster(sg_platf_cluster_cbarg_t cluster);
+
+XBT_PUBLIC(void) routing_register_callbacks(void);
+XBT_PUBLIC(void) generic_free_route(sg_platf_route_cbarg_t route); // FIXME rename to routing_route_free
+ // FIXME: make previous function private to routing again?
+
+
+XBT_PUBLIC(void) routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
+ xbt_dynar_t * route, double *latency);