From: Martin Quinson Date: Sat, 20 Feb 2016 01:05:43 +0000 (+0100) Subject: rename parseBypassroute into addBypassRoute X-Git-Tag: v3_13~774 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9cc7f58fab53a714c55293b30fa4c744aa4d859f rename parseBypassroute into addBypassRoute --- diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index e22a05c731..500f481aed 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -514,7 +514,7 @@ void sg_platf_new_route(sg_platf_route_cbarg_t route) void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) { - routing_get_current()->parseBypassroute(bypassRoute); + routing_get_current()->addBypassRoute(bypassRoute); } void sg_platf_new_process(sg_platf_process_cbarg_t process) diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 581e2d35ef..6b7959a098 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -62,7 +62,7 @@ namespace surf { void As::addRoute(sg_platf_route_cbarg_t /*route*/){ xbt_die("AS %s does not accept new routes (wrong class).",name_); } - void As::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){ + void As::addBypassRoute(sg_platf_route_cbarg_t /*e_route*/){ xbt_die("AS %s does not accept new bypass routes (wrong class).",name_); } diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 8b30f5fe1e..062c173d69 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -101,7 +101,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 addRoute(sg_platf_route_cbarg_t route); - virtual void parseBypassroute(sg_platf_route_cbarg_t e_route); + virtual void addBypassRoute(sg_platf_route_cbarg_t e_route); }; struct XBT_PRIVATE NetCardImpl : public NetCard { diff --git a/src/surf/surf_routing_RoutedGraph.cpp b/src/surf/surf_routing_RoutedGraph.cpp index 5da9ba1b0a..0bfcb661ed 100644 --- a/src/surf/surf_routing_RoutedGraph.cpp +++ b/src/surf/surf_routing_RoutedGraph.cpp @@ -44,7 +44,7 @@ AsRoutedGraph::~AsRoutedGraph() xbt_dict_free(&bypassRoutes_); } -void AsRoutedGraph::parseBypassroute(sg_platf_route_cbarg_t e_route) +void AsRoutedGraph::addBypassRoute(sg_platf_route_cbarg_t e_route) { char *src = (char*)(e_route->src); char *dst = (char*)(e_route->dst); diff --git a/src/surf/surf_routing_RoutedGraph.hpp b/src/surf/surf_routing_RoutedGraph.hpp index 5d07f7ae15..3de0bfcf23 100644 --- a/src/surf/surf_routing_RoutedGraph.hpp +++ b/src/surf/surf_routing_RoutedGraph.hpp @@ -25,7 +25,7 @@ public: virtual sg_platf_route_cbarg_t getBypassRoute(NetCard *src, NetCard *dst, double *lat) override; /* Add content to the AS, at parsing time */ - virtual void parseBypassroute(sg_platf_route_cbarg_t e_route) override; + virtual void addBypassRoute(sg_platf_route_cbarg_t e_route) override; virtual sg_platf_route_cbarg_t newExtendedRoute(e_surf_routing_hierarchy_t hierarchy, sg_platf_route_cbarg_t routearg, int change_order); protected: