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
Convert actor-execute to s4u API
[simgrid.git]
/
src
/
kernel
/
routing
/
DragonflyZone.cpp
diff --git
a/src/kernel/routing/DragonflyZone.cpp
b/src/kernel/routing/DragonflyZone.cpp
index 2b76d0b7d151e3104f7cf9019f495a072d2a8b12..790b3d10b6970b9ef7e87ae6080fc9fdc64995c4 100644
(file)
--- a/
src/kernel/routing/DragonflyZone.cpp
+++ b/
src/kernel/routing/DragonflyZone.cpp
@@
-161,7
+161,7
@@
void DragonflyZone::generateRouters()
}
}
}
}
-void DragonflyZone::createLink(
std::string
id, int numlinks, surf::LinkImpl** linkup, surf::LinkImpl** linkdown)
+void DragonflyZone::createLink(
const std::string&
id, int numlinks, surf::LinkImpl** linkup, surf::LinkImpl** linkdown)
{
*linkup = nullptr;
*linkdown = nullptr;
{
*linkup = nullptr;
*linkdown = nullptr;
@@
-290,7
+290,7
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c
dst->id());
if ((src->id() == dst->id()) && hasLoopback_) {
dst->id());
if ((src->id() == dst->id()) && hasLoopback_) {
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
src->id() * linkCountPerNode_
);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
nodePosition(src->id())
);
route->link_list->push_back(info.first);
if (latency)
route->link_list->push_back(info.first);
if (latency)
@@
-318,7
+318,7
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c
*latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency();
if (hasLimiter_) { // limiter for sender
*latency += myRouter->myNodes_[myCoords[3] * numLinksperLink_]->latency();
if (hasLimiter_) { // limiter for sender
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
src->id() * linkCountPerNode_ + hasLoopback_
);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
nodePositionWithLoopback(src->id())
);
route->link_list->push_back(info.first);
}
route->link_list->push_back(info.first);
}
@@
-364,13
+364,11
@@
void DragonflyZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_c
route->link_list->push_back(currentRouter->blackLinks_[targetCoords[1]]);
if (latency)
*latency += currentRouter->blackLinks_[targetCoords[1]]->latency();
route->link_list->push_back(currentRouter->blackLinks_[targetCoords[1]]);
if (latency)
*latency += currentRouter->blackLinks_[targetCoords[1]]->latency();
- currentRouter = routers_[targetCoords[0] * (numChassisPerGroup_ * numBladesPerChassis_) +
- targetCoords[1] * numBladesPerChassis_ + targetCoords[2]];
}
}
if (hasLimiter_) { // limiter for receiver
}
}
if (hasLimiter_) { // limiter for receiver
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
dst->id() * linkCountPerNode_ + hasLoopback_
);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
nodePositionWithLoopback(dst->id())
);
route->link_list->push_back(info.first);
}
route->link_list->push_back(info.first);
}