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
cosmetics in bypass routing
[simgrid.git]
/
src
/
kernel
/
routing
/
AsCluster.cpp
diff --git
a/src/kernel/routing/AsCluster.cpp
b/src/kernel/routing/AsCluster.cpp
index
94e2f14
..
1056f76
100644
(file)
--- a/
src/kernel/routing/AsCluster.cpp
+++ b/
src/kernel/routing/AsCluster.cpp
@@
-14,10
+14,10
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"
namespace simgrid {
namespace kernel {
namespace routing {
namespace simgrid {
namespace kernel {
namespace routing {
-
AsCluster::AsCluster(const char*
name)
- : AsImpl(name)
-
{
}
-
AsCluster::~AsCluster()=
default;
+
AsCluster::AsCluster(As* father, const char* name) : AsImpl(father,
name)
+{
+}
+
AsCluster::~AsCluster() =
default;
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
{
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
{
@@
-31,7
+31,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
info = privateLinks_.at(src->id() * linkCountPerNode_);
route->link_list->push_back(info.linkUp);
if (lat)
info = privateLinks_.at(src->id() * linkCountPerNode_);
route->link_list->push_back(info.linkUp);
if (lat)
- *lat += info.linkUp->
getL
atency();
+ *lat += info.linkUp->
l
atency();
return;
}
return;
}
@@
-45,7
+45,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
if (info.linkUp) { // link up
route->link_list->push_back(info.linkUp);
if (lat)
if (info.linkUp) { // link up
route->link_list->push_back(info.linkUp);
if (lat)
- *lat += info.linkUp->
getL
atency();
+ *lat += info.linkUp->
l
atency();
}
}
}
}
@@
-53,7
+53,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
if (backbone_) {
route->link_list->push_back(backbone_);
if (lat)
if (backbone_) {
route->link_list->push_back(backbone_);
if (lat)
- *lat += backbone_->
getL
atency();
+ *lat += backbone_->
l
atency();
}
if (! dst->isRouter()) { // No specific link for router
}
if (! dst->isRouter()) { // No specific link for router
@@
-62,7
+62,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
if (info.linkDown) { // link down
route->link_list->push_back(info.linkDown);
if (lat)
if (info.linkDown) { // link down
route->link_list->push_back(info.linkDown);
if (lat)
- *lat += info.linkDown->
getL
atency();
+ *lat += info.linkDown->
l
atency();
}
if (hasLimiter_){ // limiter for receiver
info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
}
if (hasLimiter_){ // limiter for receiver
info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
@@
-146,7
+146,7
@@
void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
info.linkUp = Link::byName(link_id);
info.linkDown = info.linkUp;
}
info.linkUp = Link::byName(link_id);
info.linkDown = info.linkUp;
}
- privateLinks_.insert(
privateLinks_.begin()+position, info
);
+ privateLinks_.insert(
{position, info}
);
xbt_free(link_id);
}
xbt_free(link_id);
}