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
Move forward declaration in simgrid/forward.h.
[simgrid.git]
/
src
/
kernel
/
routing
/
TorusZone.cpp
diff --git
a/src/kernel/routing/TorusZone.cpp
b/src/kernel/routing/TorusZone.cpp
index
a369c14
..
1d01cc9
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++;
@@
-27,11
+27,11
@@
inline void rankId_to_coords(int rankId, std::vector<unsigned int> dimensions, u
namespace simgrid {
namespace kernel {
namespace routing {
-TorusZone::TorusZone(NetZone* father,
const char*
name) : ClusterZone(father, name)
+TorusZone::TorusZone(NetZone* father,
std::string
name) : ClusterZone(father, name)
{
}
-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, unsigned
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
@@
-54,7
+54,7
@@
void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
sg_platf_new_link(&link);
surf::LinkImpl* linkUp;
surf::LinkImpl* linkDown;
- if (link.policy == SURF_LINK_
FULL
DUPLEX) {
+ if (link.policy == SURF_LINK_
SPLIT
DUPLEX) {
std::string tmp_link = link_id + "_UP";
linkUp = surf::LinkImpl::byName(tmp_link);
tmp_link = link_id + "_DOWN";
@@
-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,29
+74,27
@@
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(","));
if (not dimensions.empty()) {
/* We are in a torus cluster
- * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and sa
fe it in
a vector.
+ * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and sa
ve them into
a vector.
* Additionally, we need to know how many ranks we have in total
*/
- for (auto group : dimensions) {
- dimensions_.push_back(surf_parse_get_int(group.c_str()));
- }
+ for (auto const& group : dimensions)
+ dimensions_.push_back(surf_parse_get_int(group));
linkCountPerNode_ = dimensions_.size();
}
}
-void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst,
sg_platf_route_cbarg_t
route, double* lat)
+void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst,
RouteCreationArgs*
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;
@@
-104,7
+102,7
@@
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
if (src->id() == dst->id() && hasLoopback_) {
std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id() * linkCountPerNode_);
- route->link_list
->
push_back(info.first);
+ route->link_list
.
push_back(info.first);
if (lat)
*lat += info.first->latency();
return;
@@
-117,21
+115,16
@@
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
unsigned int current_node = src->id();
unsigned int next_node = 0;
/*
- * Arrays that hold the coordinates of the current node and
- * the target; comparing the values at the i-th position of
- * both arrays, we can easily assess whether we need to route
- * into this dimension or not.
+ * Arrays that hold the coordinates of the current node andthe target; comparing the values at the i-th position of
+ * both arrays, we can easily assess whether we need to route into this dimension or not.
*/
unsigned int myCoords[4];
rankId_to_coords(src->id(), dimensions_, &myCoords);
unsigned int targetCoords[4];
rankId_to_coords(dst->id(), dimensions_, &targetCoords);
/*
- * linkOffset describes the offset where the link
- * we want to use is stored
- * (+1 is added because each node has a link from itself to itself,
- * which can only be the case if src->m_id == dst->m_id -- see above
- * for this special case)
+ * linkOffset describes the offset where the link we want to use is stored(+1 is added because each node has a link
+ * from itself to itself, which can only be the case if src->m_id == dst->m_id -- see above for this special case)
*/
int nodeOffset = (dimensions_.size() + 1) * src->id();
@@
-141,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) {
@@
-185,18
+178,18
@@
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_
);
- route->link_list
->
push_back(info.first);
+ info = privateLinks_.at(nodeOffset +
(hasLoopback_ ? 1 : 0)
);
+ route->link_list
.
push_back(info.first);
}
info = privateLinks_.at(linkOffset);
if (use_lnk_up == false) {
- route->link_list
->
push_back(info.second);
+ route->link_list
.
push_back(info.second);
if (lat)
*lat += info.second->latency();
} else {
- route->link_list
->
push_back(info.first);
+ route->link_list
.
push_back(info.first);
if (lat)
*lat += info.first->latency();
}