From fbc5196e44c92ef4ccda2fb737423e373c03d6f9 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 19 Feb 2016 22:23:52 +0100 Subject: [PATCH] routing cleanup: symbol renaming --- include/simgrid/platf.h | 2 +- src/surf/sg_platf.cpp | 2 +- src/surf/surf_routing.cpp | 2 +- src/surf/surf_routing.hpp | 2 +- src/surf/surf_routing_dijkstra.cpp | 4 ++-- src/surf/surf_routing_dijkstra.hpp | 2 +- src/surf/surf_routing_floyd.cpp | 4 ++-- src/surf/surf_routing_floyd.hpp | 2 +- src/surf/surf_routing_full.cpp | 4 ++-- src/surf/surf_routing_full.hpp | 2 +- src/surf/surf_routing_generic.cpp | 2 +- src/surf/surf_routing_generic.hpp | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index bc195bc960..401864e5a4 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -257,7 +257,7 @@ XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform XBT_PUBLIC(void) sg_platf_end(void); // Finish the creation of the platform XBT_PUBLIC(void) sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS -XBT_PUBLIC(void) sg_platf_new_AS_end(void); // That AS is fully described +XBT_PUBLIC(void) sg_platf_new_AS_end(void); // That AS is fully described XBT_PUBLIC(void) sg_platf_new_host (sg_platf_host_cbarg_t host); // Add an host to the currently described AS XBT_PUBLIC(void) sg_platf_new_hostlink(sg_platf_host_link_cbarg_t h); // Add an host_link to the currently described AS diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index be65755175..2e0adcac07 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -510,7 +510,7 @@ void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ void sg_platf_new_route(sg_platf_route_cbarg_t route) { - routing_get_current()->parseRoute(route); + routing_get_current()->addRoute(route); } void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 7cee152ca4..ad2a748186 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -54,7 +54,7 @@ namespace surf { return xbt_dynar_length(vertices_)-1; } - void As::parseRoute(sg_platf_route_cbarg_t /*route*/){ + void As::addRoute(sg_platf_route_cbarg_t /*route*/){ THROW_IMPOSSIBLE; /* No. */ } void As::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){ diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 0f398c5545..077b4350f5 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -99,7 +99,7 @@ public: /* Add content to the AS, at parsing time. It should be sealed afterward. */ virtual int addComponent(NetCard *elm); /* A host, a router or an AS, whatever */ - virtual void parseRoute(sg_platf_route_cbarg_t route); + virtual void addRoute(sg_platf_route_cbarg_t route); virtual void parseBypassroute(sg_platf_route_cbarg_t e_route); }; diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp index 36e615d229..12f3eeaa27 100644 --- a/src/surf/surf_routing_dijkstra.cpp +++ b/src/surf/surf_routing_dijkstra.cpp @@ -349,14 +349,14 @@ AsDijkstra::AsDijkstra(const char*name, bool cached) routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free); } -void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) +void AsDijkstra::addRoute(sg_platf_route_cbarg_t route) { const char *srcName = route->src; const char *dstName = route->dst; NetCard *src = sg_netcard_by_name_or_null(srcName); NetCard *dst = sg_netcard_by_name_or_null(dstName); - parseRouteCheckParams(route); + addRouteCheckParams(route); /* Create the topology graph */ if(!routeGraph_) diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp index dd1523bfce..b74565729f 100644 --- a/src/surf/surf_routing_dijkstra.hpp +++ b/src/surf/surf_routing_dijkstra.hpp @@ -59,7 +59,7 @@ public: void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) override; void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat); // FIXME: this function is dangerously not overriding because of diverging prototype xbt_dynar_t getOneLinkRoutes() override; - void parseRoute(sg_platf_route_cbarg_t route) override; + void addRoute(sg_platf_route_cbarg_t route) override; xbt_graph_t routeGraph_ = nullptr; /* xbt_graph */ xbt_dict_t graphNodeMap_ = nullptr; /* map */ diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index 487460ca9c..9a51912215 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -129,7 +129,7 @@ static int floyd_pointer_resource_cmp(const void *a, const void *b) { return a != b; } -void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) +void AsFloyd::addRoute(sg_platf_route_cbarg_t route) { /* set the size of table routing */ int table_size = (int)xbt_dynar_length(vertices_); @@ -137,7 +137,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) NetCard *src = sg_netcard_by_name_or_null(route->src); NetCard *dst = sg_netcard_by_name_or_null(route->dst); - parseRouteCheckParams(route); + addRouteCheckParams(route); if(!linkTable_) { /* Create Cost, Predecessor and Link tables */ diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp index 9e3d722353..50bd652d8c 100644 --- a/src/surf/surf_routing_floyd.hpp +++ b/src/surf/surf_routing_floyd.hpp @@ -28,7 +28,7 @@ public: void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override; xbt_dynar_t getOneLinkRoutes() override; - void parseRoute(sg_platf_route_cbarg_t route) override; + void addRoute(sg_platf_route_cbarg_t route) override; void Seal() override; private: diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp index 427af14b3f..d452c3e512 100644 --- a/src/surf/surf_routing_full.cpp +++ b/src/surf/surf_routing_full.cpp @@ -130,14 +130,14 @@ static int full_pointer_resource_cmp(const void *a, const void *b) return a != b; } -void AsFull::parseRoute(sg_platf_route_cbarg_t route) +void AsFull::addRoute(sg_platf_route_cbarg_t route) { const char *src = route->src; const char *dst = route->dst; NetCard *src_net_elm = sg_netcard_by_name_or_null(src); NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst); - parseRouteCheckParams(route); + addRouteCheckParams(route); size_t table_size = xbt_dynar_length(vertices_); diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp index da84f718ea..9dfc1e21cb 100644 --- a/src/surf/surf_routing_full.hpp +++ b/src/surf/surf_routing_full.hpp @@ -29,7 +29,7 @@ public: void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override; xbt_dynar_t getOneLinkRoutes() override; - void parseRoute(sg_platf_route_cbarg_t route) override; + void addRoute(sg_platf_route_cbarg_t route) override; sg_platf_route_cbarg_t *routingTable_ = nullptr; }; diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp index 031f460ae9..a83fb94fad 100644 --- a/src/surf/surf_routing_generic.cpp +++ b/src/surf/surf_routing_generic.cpp @@ -387,7 +387,7 @@ void AsGeneric::getRouteCheckParams(NetCard *src, NetCard *dst) "Internal error: route destination %s@%s is not in AS %s as expected (route source: %s@%s). Please report that bug.", src->name(), dst->name(), src_as->name_, dst_as->name_, name_); } -void AsGeneric::parseRouteCheckParams(sg_platf_route_cbarg_t route) { +void AsGeneric::addRouteCheckParams(sg_platf_route_cbarg_t route) { const char *srcName = route->src; const char *dstName = route->dst; NetCard *src = sg_netcard_by_name_or_null(srcName); diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp index 6587ace548..9f4d275244 100644 --- a/src/surf/surf_routing_generic.hpp +++ b/src/surf/surf_routing_generic.hpp @@ -30,7 +30,7 @@ public: virtual sg_platf_route_cbarg_t newExtendedRoute(e_surf_routing_hierarchy_t hierarchy, sg_platf_route_cbarg_t routearg, int change_order); protected: void getRouteCheckParams(NetCard *src, NetCard *dst); - void parseRouteCheckParams(sg_platf_route_cbarg_t route); + void addRouteCheckParams(sg_platf_route_cbarg_t route); }; } -- 2.20.1