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
Drop unused parameters.
[simgrid.git]
/
src
/
kernel
/
routing
/
FullZone.cpp
diff --git
a/src/kernel/routing/FullZone.cpp
b/src/kernel/routing/FullZone.cpp
index
b703702
..
37bf653
100644
(file)
--- a/
src/kernel/routing/FullZone.cpp
+++ b/
src/kernel/routing/FullZone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-20
20
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-16,7
+16,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
namespace simgrid {
namespace kernel {
namespace routing {
namespace simgrid {
namespace kernel {
namespace routing {
-FullZone::FullZone(NetZoneImpl* father,
std::string
name, resource::NetworkModel* netmodel)
+FullZone::FullZone(NetZoneImpl* father,
const std::string&
name, resource::NetworkModel* netmodel)
: RoutedZone(father, name, netmodel)
{
}
: RoutedZone(father, name, netmodel)
{
}
@@
-59,7
+59,7
@@
void FullZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
unsigned int table_size = get_table_size();
XBT_DEBUG("full getLocalRoute from %s[%u] to %s[%u]", src->get_cname(), src->id(), dst->get_cname(), dst->id());
unsigned int table_size = get_table_size();
-
RouteCreationArgs* e_route
= TO_ROUTE_FULL(src->id(), dst->id());
+
const RouteCreationArgs* e_route
= TO_ROUTE_FULL(src->id(), dst->id());
if (e_route != nullptr) {
res->gw_src = e_route->gw_src;
if (e_route != nullptr) {
res->gw_src = e_route->gw_src;
@@
-93,8
+93,7
@@
void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoin
dst->get_cname());
/* Add the route to the base */
dst->get_cname());
/* Add the route to the base */
- TO_ROUTE_FULL(src->id(), dst->id()) =
- new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, true);
+ TO_ROUTE_FULL(src->id(), dst->id()) = new_extended_route(hierarchy_, gw_src, gw_dst, link_list, true);
if (symmetrical == true && src != dst) {
if (gw_dst && gw_src) {
if (symmetrical == true && src != dst) {
if (gw_dst && gw_src) {
@@
-112,8
+111,7
@@
void FullZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoin
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->get_cname(), src->get_cname());
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->get_cname(), src->get_cname());
- TO_ROUTE_FULL(dst->id(), src->id()) =
- new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, false);
+ TO_ROUTE_FULL(dst->id(), src->id()) = new_extended_route(hierarchy_, gw_src, gw_dst, link_list, false);
}
}
}
}
}
}