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
please codacy: use long form of negation in C++
[simgrid.git]
/
src
/
kernel
/
routing
/
FullZone.cpp
diff --git
a/src/kernel/routing/FullZone.cpp
b/src/kernel/routing/FullZone.cpp
index
93210c6
..
89cdec6
100644
(file)
--- a/
src/kernel/routing/FullZone.cpp
+++ b/
src/kernel/routing/FullZone.cpp
@@
-4,7
+4,7
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/routing/FullZone.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/routing/FullZone.hpp"
-#include "src/kernel/routing/Net
Card
.hpp"
+#include "src/kernel/routing/Net
Point
.hpp"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
@@
-20,25
+20,21
@@
FullZone::FullZone(NetZone* father, const char* name) : RoutedZone(father, name)
void FullZone::seal()
{
void FullZone::seal()
{
- int i;
- sg_platf_route_cbarg_t e_route;
-
- /* set utils vars */
int table_size = static_cast<int>(vertices_.size());
int table_size = static_cast<int>(vertices_.size());
- /* Create table if ne
cessary
*/
- if (
!
routingTable_)
+ /* Create table if ne
eded
*/
+ if (
not
routingTable_)
routingTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
/* Add the loopback if needed */
if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
routingTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
/* Add the loopback if needed */
if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
- for (i = 0; i < table_size; i++) {
- e_route = TO_ROUTE_FULL(i, i);
- if (
!
e_route) {
+ for (i
nt i
= 0; i < table_size; i++) {
+
sg_platf_route_cbarg_t
e_route = TO_ROUTE_FULL(i, i);
+ if (
not
e_route) {
e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
e_route->gw_src = nullptr;
e_route->gw_dst = nullptr;
e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
e_route->gw_src = nullptr;
e_route->gw_dst = nullptr;
- e_route->link_list = new std::vector<
Link
*>();
+ e_route->link_list = new std::vector<
surf::LinkImpl
*>();
e_route->link_list->push_back(surf_network_model->loopback_);
TO_ROUTE_FULL(i, i) = e_route;
}
e_route->link_list->push_back(surf_network_model->loopback_);
TO_ROUTE_FULL(i, i) = e_route;
}
@@
-62,7
+58,7
@@
FullZone::~FullZone()
}
}
}
}
-void FullZone::getLocalRoute(Net
Card* src, NetCard
* dst, sg_platf_route_cbarg_t res, double* lat)
+void FullZone::getLocalRoute(Net
Point* src, NetPoint
* dst, sg_platf_route_cbarg_t res, double* lat)
{
XBT_DEBUG("full getLocalRoute from %s[%d] to %s[%d]", src->cname(), src->id(), dst->cname(), dst->id());
{
XBT_DEBUG("full getLocalRoute from %s[%d] to %s[%d]", src->cname(), src->id(), dst->cname(), dst->id());
@@
-82,13
+78,13
@@
void FullZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t
void FullZone::addRoute(sg_platf_route_cbarg_t route)
{
void FullZone::addRoute(sg_platf_route_cbarg_t route)
{
- Net
Card
* src = route->src;
- Net
Card
* dst = route->dst;
+ Net
Point
* src = route->src;
+ Net
Point
* dst = route->dst;
addRouteCheckParams(route);
size_t table_size = vertices_.size();
addRouteCheckParams(route);
size_t table_size = vertices_.size();
- if (
!
routingTable_)
+ if (
not
routingTable_)
routingTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
/* Check that the route does not already exist */
routingTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size);
/* Check that the route does not already exist */
@@
-102,12
+98,11
@@
void FullZone::addRoute(sg_platf_route_cbarg_t route)
dst->cname());
/* Add the route to the base */
dst->cname());
/* Add the route to the base */
- TO_ROUTE_FULL(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, 1);
- TO_ROUTE_FULL(src->id(), dst->id())->link_list->shrink_to_fit();
+ TO_ROUTE_FULL(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, true);
if (route->symmetrical == true && src != dst) {
if (route->gw_dst && route->gw_src) {
if (route->symmetrical == true && src != dst) {
if (route->gw_dst && route->gw_src) {
- Net
Card
* gw_tmp = route->gw_src;
+ Net
Point
* gw_tmp = route->gw_src;
route->gw_src = route->gw_dst;
route->gw_dst = gw_tmp;
}
route->gw_src = route->gw_dst;
route->gw_dst = gw_tmp;
}
@@
-121,8
+116,7
@@
void FullZone::addRoute(sg_platf_route_cbarg_t route)
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->cname(), src->cname());
"The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
dst->cname(), src->cname());
- TO_ROUTE_FULL(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, 0);
- TO_ROUTE_FULL(dst->id(), src->id())->link_list->shrink_to_fit();
+ TO_ROUTE_FULL(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, false);
}
}
}
}
}
}