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
4992637
..
1d01cc9
100644
(file)
--- a/
src/kernel/routing/TorusZone.cpp
+++ b/
src/kernel/routing/TorusZone.cpp
@@
-31,7
+31,7
@@
TorusZone::TorusZone(NetZone* father, std::string name) : ClusterZone(father, na
{
}
{
}
-void TorusZone::create_links_for_node(ClusterCreationArgs* 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
{
/* 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(ClusterCreationArgs* cluster, int id, int
sg_platf_new_link(&link);
surf::LinkImpl* linkUp;
surf::LinkImpl* linkDown;
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";
std::string tmp_link = link_id + "_UP";
linkUp = surf::LinkImpl::byName(tmp_link);
tmp_link = link_id + "_DOWN";
@@
-91,7
+91,7
@@
void TorusZone::parse_specific_arguments(ClusterCreationArgs* cluster)
}
}
}
}
-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->getCname(), src->id(), dst->getCname(), dst->id());
{
XBT_VERB("torus getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id());
@@
-102,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_);
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;
if (lat)
*lat += info.first->latency();
return;
@@
-179,17
+179,17
@@
void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
if (hasLimiter_) { // limiter for sender
info = privateLinks_.at(nodeOffset + (hasLoopback_ ? 1 : 0));
if (hasLimiter_) { // limiter for sender
info = privateLinks_.at(nodeOffset + (hasLoopback_ ? 1 : 0));
- route->link_list
->
push_back(info.first);
+ route->link_list
.
push_back(info.first);
}
info = privateLinks_.at(linkOffset);
if (use_lnk_up == false) {
}
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 {
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();
}
if (lat)
*lat += info.first->latency();
}