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
try to please sonar and avoid protected fields
[simgrid.git]
/
src
/
kernel
/
routing
/
FloydZone.cpp
diff --git
a/src/kernel/routing/FloydZone.cpp
b/src/kernel/routing/FloydZone.cpp
index
1c20629
..
457b0e1
100644
(file)
--- a/
src/kernel/routing/FloydZone.cpp
+++ b/
src/kernel/routing/FloydZone.cpp
@@
-32,10
+32,10
@@
FloydZone::~FloydZone()
{
if (linkTable_ == nullptr) // Dealing with a parse error in the file?
return;
-
int table_size = vertices_.s
ize();
+
unsigned int table_size = getTableS
ize();
/* Delete link_table */
- for (int i = 0; i < table_size; i++)
- for (int j = 0; j < table_size; j++)
+ for (
unsigned
int i = 0; i < table_size; i++)
+ for (
unsigned
int j = 0; j < table_size; j++)
routing_route_free(TO_FLOYD_LINK(i, j));
xbt_free(linkTable_);
@@
-45,7
+45,7
@@
FloydZone::~FloydZone()
void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
-
size_t table_size = vertices_.s
ize();
+
unsigned int table_size = getTableS
ize();
getRouteCheckParams(src, dst);
@@
-65,8
+65,8
@@
void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
route->gw_dst = route_stack.front()->gw_dst;
}
- sg_net
card
_t prev_dst_gw = nullptr;
- while (
!
route_stack.empty()) {
+ sg_net
point
_t prev_dst_gw = nullptr;
+ while (
not
route_stack.empty()) {
sg_platf_route_cbarg_t e_route = route_stack.back();
route_stack.pop_back();
if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr &&
@@
-87,19
+87,19
@@
void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
void FloydZone::addRoute(sg_platf_route_cbarg_t route)
{
/* set the size of table routing */
-
int table_size = static_cast<int>(vertices_.size()
);
+
unsigned int table_size = getTableSize(
);
addRouteCheckParams(route);
- if (
!
linkTable_) {
+ if (
not
linkTable_) {
/* Create Cost, Predecessor and Link tables */
costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */
predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */
linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */
/* Initialize costs and predecessors */
- for (int i = 0; i < table_size; i++)
- for (int j = 0; j < table_size; j++) {
+ for (
unsigned
int i = 0; i < table_size; i++)
+ for (
unsigned
int j = 0; j < table_size; j++) {
TO_FLOYD_COST(i, j) = DBL_MAX;
TO_FLOYD_PRED(i, j) = -1;
TO_FLOYD_LINK(i, j) = nullptr;
@@
-140,7
+140,7
@@
void FloydZone::addRoute(sg_platf_route_cbarg_t route)
route->gw_dst = gw_tmp;
}
- if (
!route->gw_src && !
route->gw_dst)
+ if (
not route->gw_src && not
route->gw_dst)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->name().c_str(), route->src->name().c_str());
else
XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(),
@@
-156,9
+156,9
@@
void FloydZone::addRoute(sg_platf_route_cbarg_t route)
void FloydZone::seal()
{
/* set the size of table routing */
-
size_t table_size = vertices_.s
ize();
+
unsigned int table_size = getTableS
ize();
- if (
!
linkTable_) {
+ if (
not
linkTable_) {
/* Create Cost, Predecessor and Link tables */
costTable_ = xbt_new0(double, table_size* table_size); /* link cost from host to host */
predecessorTable_ = xbt_new0(int, table_size* table_size); /* predecessor host numbers */
@@
-177,11
+177,11
@@
void FloydZone::seal()
if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
for (unsigned int i = 0; i < table_size; i++) {
sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i);
- if (
!
e_route) {
+ 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->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_FLOYD_LINK(i, i) = e_route;
TO_FLOYD_PRED(i, i) = i;