From 775902179ef85ee0dd9a2afdcd5750e1146ec0b2 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 11 Feb 2016 15:14:23 +0100 Subject: [PATCH] cleanup: rename a symbol --- src/surf/surf_private.h | 3 +-- src/surf/surf_routing.cpp | 2 +- src/surf/surf_routing_floyd.cpp | 2 +- src/surf/surf_routing_generic.cpp | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index ceb1aa9294..43d0e585b4 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -73,8 +73,7 @@ XBT_PUBLIC(void) routing_exit(void); XBT_PUBLIC(void) storage_register_callbacks(void); 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_route_free(sg_platf_route_cbarg_t route); // FIXME: make previous function private to routing again? XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc); /** diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 13e27f551d..4578350a26 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -378,7 +378,7 @@ static void _get_route_and_latency( /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ if (e_route_bypass) { xbt_dynar_merge(links, &e_route_bypass->link_list); - generic_free_route(e_route_bypass); + routing_route_free(e_route_bypass); return; } diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index 934273b73a..831b4d3722 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -42,7 +42,7 @@ AsFloyd::~AsFloyd(){ /* Delete link_table */ for (i = 0; i < table_size; i++) for (j = 0; j < table_size; j++) { - generic_free_route(TO_FLOYD_LINK(i, j)); + routing_route_free(TO_FLOYD_LINK(i, j)); } xbt_free(p_linkTable); /* Delete bypass dict */ diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp index fb94ab5d70..c455405087 100644 --- a/src/surf/surf_routing_generic.cpp +++ b/src/surf/surf_routing_generic.cpp @@ -24,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic imple static int no_bypassroute_declared = 1; -void generic_free_route(sg_platf_route_cbarg_t route) +void routing_route_free(sg_platf_route_cbarg_t route) { if (route) { xbt_dynar_free(&route->link_list); @@ -48,7 +48,7 @@ void AsGeneric::getRouteAndLatency(NetCard */*src*/, NetCard */*dst*/, sg_platf_ } AsGeneric::AsGeneric() { - p_bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) generic_free_route); + p_bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free); } AsGeneric::~AsGeneric() { -- 2.20.1