extern routing_component_t current_routing;
extern model_type_t current_routing_model;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
typedef struct {
s_routing_component_t generic_routing;
static void graph_node_map_elem_free(void *e)
{
graph_node_map_element_t elm = (graph_node_map_element_t) e;
- if (elm) {
- xbt_free(elm);
- }
+ xbt_free(elm);
}
static void graph_edge_data_free(void *e)
route_extended_t e_route = (route_extended_t) e;
if (e_route) {
xbt_dynar_free(&(e_route->generic_route.link_list));
- if (e_route->src_gateway)
- xbt_free(e_route->src_gateway);
- if (e_route->dst_gateway)
- xbt_free(e_route->dst_gateway);
+ xbt_free(e_route->src_gateway);
+ xbt_free(e_route->dst_gateway);
xbt_free(e_route);
}
}
/* Creation routing model functions */
-void *model_dijkstra_both_create(int cached)
+routing_component_t model_dijkstra_both_create(int cached)
{
routing_component_dijkstra_t new_component =
xbt_new0(s_routing_component_dijkstra_t, 1);
new_component->generic_routing.to_index = xbt_dict_new();
new_component->generic_routing.bypassRoutes = xbt_dict_new();
new_component->generic_routing.get_network_element_type = get_network_element_type;
- return new_component;
+ return (routing_component_t)new_component;
}
-void *model_dijkstra_create(void)
+routing_component_t model_dijkstra_create(void)
{
return model_dijkstra_both_create(0);
}
-void *model_dijkstracache_create(void)
+routing_component_t model_dijkstracache_create(void)
{
return model_dijkstra_both_create(1);
}
-void model_dijkstra_both_load(void)
-{
- /* use "surfxml_add_callback" to add a parse function call */
-}
-
-void model_dijkstra_both_unload(void)
-{
- /* use "surfxml_del_callback" to remove a parse function call */
-}
-
void model_dijkstra_both_end(void)
{
routing_component_dijkstra_t routing =