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
Change name()/cname() to getName()/getCname() in kernel::routing::NetPoint.
[simgrid.git]
/
src
/
kernel
/
routing
/
TorusZone.cpp
diff --git
a/src/kernel/routing/TorusZone.cpp
b/src/kernel/routing/TorusZone.cpp
index
cf31241
..
4992637
100644
(file)
--- a/
src/kernel/routing/TorusZone.cpp
+++ b/
src/kernel/routing/TorusZone.cpp
@@
-17,7
+17,7
@@
inline void rankId_to_coords(int rankId, std::vector<unsigned int> dimensions, u
{
unsigned int dim_size_product = 1;
unsigned int i = 0;
- for (auto c
ur_dim_size
: dimensions) {
+ for (auto c
onst& cur_dim_size
: dimensions) {
(*coords)[i] = (rankId / dim_size_product) % cur_dim_size;
dim_size_product *= cur_dim_size;
i++;
@@
-31,7
+31,7
@@
TorusZone::TorusZone(NetZone* father, std::string name) : ClusterZone(father, na
{
}
-void TorusZone::create_links_for_node(
sg_platf_cluster_cbarg_t
cluster, int id, int rank, int position)
+void TorusZone::create_links_for_node(
ClusterCreationArgs*
cluster, int id, int rank, int position)
{
/* Create all links that exist in the torus. Each rank creates @a dimensions-1 links */
int dim_product = 1; // Needed to calculate the next neighbor_id
@@
-64,8
+64,8
@@
void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
linkDown = linkUp;
}
/*
- * Add the link to its appropriate position
;
- *
n
ote that position rankId*(xbt_dynar_length(dimensions)+has_loopback?+has_limiter?)
+ * Add the link to its appropriate position
.
+ *
N
ote that position rankId*(xbt_dynar_length(dimensions)+has_loopback?+has_limiter?)
* holds the link "rankId->rankId"
*/
privateLinks_.insert({position + j, {linkUp, linkDown}});
@@
-74,7
+74,7
@@
void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
rank++;
}
-void TorusZone::parse_specific_arguments(
sg_platf_cluster_cbarg_t
cluster)
+void TorusZone::parse_specific_arguments(
ClusterCreationArgs*
cluster)
{
std::vector<std::string> dimensions;
boost::split(dimensions, cluster->topo_parameters, boost::is_any_of(","));
@@
-84,7
+84,7
@@
void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
* Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and save them into a vector.
* Additionally, we need to know how many ranks we have in total
*/
- for (auto group : dimensions)
+ for (auto
const&
group : dimensions)
dimensions_.push_back(surf_parse_get_int(group));
linkCountPerNode_ = dimensions_.size();
@@
-94,8
+94,7
@@
void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
- XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->name().c_str(), src->id(), dst->name().c_str(),
- dst->id());
+ XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id());
if (dst->isRouter() || src->isRouter())
return;
@@
-135,7
+134,7
@@
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
while (current_node != dst->id()) {
unsigned int dim_product = 1; // First, we will route in x-dimension
int j=0;
- for (auto c
ur_dim : dimensions_)
{
+ for (auto c
onst& cur_dim : dimensions_)
{
// current_node/dim_product = position in current dimension
if ((current_node / dim_product) % cur_dim != (dst->id() / dim_product) % cur_dim) {
@@
-179,7
+178,7
@@
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
std::pair<surf::LinkImpl*, surf::LinkImpl*> info;
if (hasLimiter_) { // limiter for sender
- info = privateLinks_.at(nodeOffset +
hasLoopback_
);
+ info = privateLinks_.at(nodeOffset +
(hasLoopback_ ? 1 : 0)
);
route->link_list->push_back(info.first);
}