A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Another bunch of s/malloc/new/.
[simgrid.git]
/
src
/
kernel
/
routing
/
RoutedZone.cpp
diff --git
a/src/kernel/routing/RoutedZone.cpp
b/src/kernel/routing/RoutedZone.cpp
index
cd223f1
..
cb2d000
100644
(file)
--- a/
src/kernel/routing/RoutedZone.cpp
+++ b/
src/kernel/routing/RoutedZone.cpp
@@
-18,7
+18,7
@@
void routing_route_free(sg_platf_route_cbarg_t route)
{
if (route) {
delete route->link_list;
-
xbt_free(route)
;
+
delete route
;
}
}
@@
-73,12
+73,12
@@
void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
{
std::vector<kernel::routing::NetPoint*> vertices = getVertices();
- for (auto my_src : vertices) {
- for (auto my_dst : vertices) {
+ for (auto
const&
my_src : vertices) {
+ for (auto
const&
my_dst : vertices) {
if (my_src == my_dst)
continue;
- sg_platf_route_cbarg_t route =
xbt_new0(s_sg_platf_route_cbarg_t, 1)
;
+ sg_platf_route_cbarg_t route =
new s_sg_platf_route_cbarg_t
;
route->link_list = new std::vector<surf::LinkImpl*>();
getLocalRoute(my_src, my_dst, route, nullptr);
@@
-98,7
+98,7
@@
void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
previous_name = my_src->cname();
}
- for (auto link : *route->link_list) {
+ for (auto
const&
link : *route->link_list) {
const char* link_name = link->cname();
current = new_xbt_graph_node(graph, link_name, nodes);
current_name = link_name;
@@
-119,7
+119,7
@@
void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
XBT_DEBUG(" %s -> %s", previous_name, current_name);
delete route->link_list;
-
xbt_free(route)
;
+
delete route
;
}
}
}
@@
-132,7
+132,7
@@
sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
{
sg_platf_route_cbarg_t result;
- result =
xbt_new0(s_sg_platf_route_cbarg_t, 1)
;
+ result =
new s_sg_platf_route_cbarg_t
;
result->link_list = new std::vector<surf::LinkImpl*>();
xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
@@
-145,7
+145,7
@@
sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
result->gw_dst = routearg->gw_dst;
}
- for (auto link : *routearg->link_list) {
+ for (auto
const&
link : *routearg->link_list) {
if (change_order)
result->link_list->push_back(link);
else
@@
-179,7
+179,7
@@
void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
const char* srcName = src->cname();
const char* dstName = dst->cname();
- if (not route->gw_dst
&&
not route->gw_src) {
+ if (not route->gw_dst
||
not route->gw_src) {
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);
xbt_assert(src, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, srcName);
xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName);