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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
AsClusterTorus.cpp
diff --git
a/src/surf/AsClusterTorus.cpp
b/src/surf/AsClusterTorus.cpp
index
af5abc7
..
946b349
100644
(file)
--- a/
src/surf/AsClusterTorus.cpp
+++ b/
src/surf/AsClusterTorus.cpp
@@
-63,14
+63,14
@@
namespace simgrid {
s_surf_parsing_link_up_down_t info;
if (link.policy == SURF_LINK_FULLDUPLEX) {
char *tmp_link = bprintf("%s_UP", link_id);
s_surf_parsing_link_up_down_t info;
if (link.policy == SURF_LINK_FULLDUPLEX) {
char *tmp_link = bprintf("%s_UP", link_id);
- info.link
_u
p = Link::byName(tmp_link);
+ info.link
U
p = Link::byName(tmp_link);
free(tmp_link);
tmp_link = bprintf("%s_DOWN", link_id);
free(tmp_link);
tmp_link = bprintf("%s_DOWN", link_id);
- info.link
_d
own = Link::byName(tmp_link);
+ info.link
D
own = Link::byName(tmp_link);
free(tmp_link);
} else {
free(tmp_link);
} else {
- info.link
_u
p = Link::byName(link_id);
- info.link
_down = info.link_u
p;
+ info.link
U
p = Link::byName(link_id);
+ info.link
Down = info.linkU
p;
}
/*
* Add the link to its appropriate position;
}
/*
* Add the link to its appropriate position;
@@
-91,7
+91,7
@@
namespace simgrid {
xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ",");
if (!xbt_dynar_is_empty(dimensions)) {
xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ",");
if (!xbt_dynar_is_empty(dimensions)) {
- dimensions_ = xbt_dynar_new(sizeof(int),
NULL
);
+ dimensions_ = xbt_dynar_new(sizeof(int),
nullptr
);
/* We are in a torus cluster
* Parse attribute dimensions="dim1,dim2,dim3,...,dimN"
* and safe it in a dynarray.
/* We are in a torus cluster
* Parse attribute dimensions="dim1,dim2,dim3,...,dimN"
* and safe it in a dynarray.
@@
-102,7
+102,7
@@
namespace simgrid {
xbt_dynar_set_as(dimensions_, iter, int, tmp);
}
xbt_dynar_set_as(dimensions_, iter, int, tmp);
}
-
nb_links_per_n
ode_ = xbt_dynar_length(dimensions_);
+
linkCountPerN
ode_ = xbt_dynar_length(dimensions_);
}
xbt_dynar_free(&dimensions);
}
xbt_dynar_free(&dimensions);
@@
-116,12
+116,12
@@
namespace simgrid {
if (dst->isRouter() || src->isRouter())
return;
if (dst->isRouter() || src->isRouter())
return;
- if ((src->id() == dst->id()) && has
_l
oopback_) {
- s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, src->id() *
nb_links_per_n
ode_, s_surf_parsing_link_up_down_t);
+ if ((src->id() == dst->id()) && has
L
oopback_) {
+ s_surf_parsing_link_up_down_t info = xbt_dynar_get_as(privateLinks_, src->id() *
linkCountPerN
ode_, s_surf_parsing_link_up_down_t);
- route->link_list->push_back(info.link
_u
p);
+ route->link_list->push_back(info.link
U
p);
if (lat)
if (lat)
- *lat += info.link
_u
p->getLatency();
+ *lat += info.link
U
p->getLatency();
return;
}
return;
}
@@
-170,8
+170,8
@@
namespace simgrid {
next_node = (current_node + dim_product);
// HERE: We use *CURRENT* node for calculation (as opposed to next_node)
next_node = (current_node + dim_product);
// HERE: We use *CURRENT* node for calculation (as opposed to next_node)
- nodeOffset = current_node * (
nb_links_per_n
ode_);
- linkOffset = nodeOffset +
has_loopback_ + has_limiter_
+ j;
+ nodeOffset = current_node * (
linkCountPerN
ode_);
+ linkOffset = nodeOffset +
(hasLoopback_?1:0) + (hasLimiter_?1:0)
+ j;
use_lnk_up = true;
assert(linkOffset >= 0);
} else { // Route to the left
use_lnk_up = true;
assert(linkOffset >= 0);
} else { // Route to the left
@@
-181,8
+181,8
@@
namespace simgrid {
next_node = (current_node - dim_product);
// HERE: We use *next* node for calculation (as opposed to current_node!)
next_node = (current_node - dim_product);
// HERE: We use *next* node for calculation (as opposed to current_node!)
- nodeOffset = next_node * (
nb_links_per_n
ode_);
- linkOffset = nodeOffset + j +
has_loopback_ + has_limiter_
;
+ nodeOffset = next_node * (
linkCountPerN
ode_);
+ linkOffset = nodeOffset + j +
(hasLoopback_?1:0) + (hasLimiter_?1:0)
;
use_lnk_up = false;
assert(linkOffset >= 0);
use_lnk_up = false;
assert(linkOffset >= 0);
@@
-198,21
+198,21
@@
namespace simgrid {
s_surf_parsing_link_up_down_t info;
s_surf_parsing_link_up_down_t info;
- if (has
_l
imiter_) { // limiter for sender
- info = xbt_dynar_get_as(privateLinks_, nodeOffset + has
_l
oopback_, s_surf_parsing_link_up_down_t);
- route->link_list->push_back(info.link
_u
p);
+ if (has
L
imiter_) { // limiter for sender
+ info = xbt_dynar_get_as(privateLinks_, nodeOffset + has
L
oopback_, s_surf_parsing_link_up_down_t);
+ route->link_list->push_back(info.link
U
p);
}
info = xbt_dynar_get_as(privateLinks_, linkOffset, s_surf_parsing_link_up_down_t);
if (use_lnk_up == false) {
}
info = xbt_dynar_get_as(privateLinks_, linkOffset, s_surf_parsing_link_up_down_t);
if (use_lnk_up == false) {
- route->link_list->push_back(info.link
_d
own);
+ route->link_list->push_back(info.link
D
own);
if (lat)
if (lat)
- *lat += info.link
_d
own->getLatency();
+ *lat += info.link
D
own->getLatency();
} else {
} else {
- route->link_list->push_back(info.link
_u
p);
+ route->link_list->push_back(info.link
U
p);
if (lat)
if (lat)
- *lat += info.link
_u
p->getLatency();
+ *lat += info.link
U
p->getLatency();
}
current_node = next_node;
next_node = 0;
}
current_node = next_node;
next_node = 0;