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
/
ClusterZone.cpp
diff --git
a/src/kernel/routing/ClusterZone.cpp
b/src/kernel/routing/ClusterZone.cpp
index
78e3d89
..
33e0863
100644
(file)
--- a/
src/kernel/routing/ClusterZone.cpp
+++ b/
src/kernel/routing/ClusterZone.cpp
@@
-20,7
+20,7
@@
ClusterZone::ClusterZone(NetZone* father, std::string name) : NetZoneImpl(father
{
}
-void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst,
sg_platf_route_cbarg_t
route, double* lat)
+void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst,
RouteCreationArgs*
route, double* lat)
{
XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id());
xbt_assert(not privateLinks_.empty(),
@@
-30,7
+30,7
@@
void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba
xbt_assert(not src->isRouter(), "Routing from a cluster private router to itself is meaningless");
std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePosition(src->id()));
- route->link_list
->
push_back(info.first);
+ route->link_list
.
push_back(info.first);
if (lat)
*lat += info.first->latency();
return;
@@
-39,19
+39,19
@@
void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba
if (not src->isRouter()) { // No private link for the private router
if (hasLimiter_) { // limiter for sender
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);
}
std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePositionWithLimiter(src->id()));
if (info.first) { // link up
- route->link_list
->
push_back(info.first);
+ route->link_list
.
push_back(info.first);
if (lat)
*lat += info.first->latency();
}
}
if (backbone_) {
- route->link_list
->
push_back(backbone_);
+ route->link_list
.
push_back(backbone_);
if (lat)
*lat += backbone_->latency();
}
@@
-60,18
+60,19
@@
void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cba
std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePositionWithLimiter(dst->id()));
if (info.second) { // link down
- route->link_list
->
push_back(info.second);
+ route->link_list
.
push_back(info.second);
if (lat)
*lat += info.second->latency();
}
if (hasLimiter_) { // limiter for receiver
info = privateLinks_.at(nodePositionWithLoopback(dst->id()));
- route->link_list
->
push_back(info.first);
+ route->link_list
.
push_back(info.first);
}
}
}
-void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
+void ClusterZone::getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+ std::map<std::string, xbt_edge_t>* edges)
{
xbt_assert(router_,
"Malformed cluster. This may be because your platform file is a hypergraph while it must be a graph.");
@@
-116,7
+117,7
@@
void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
}
}
-void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int /*rank*/, int position)
+void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int /*rank*/,
unsigned
int position)
{
std::string link_id = cluster->id + "_link_" + std::to_string(id);
@@
-129,7
+130,7
@@
void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in
surf::LinkImpl *linkUp;
surf::LinkImpl *linkDown;
- if (link.policy == SURF_LINK_
FULL
DUPLEX) {
+ if (link.policy == SURF_LINK_
SPLIT
DUPLEX) {
linkUp = surf::LinkImpl::byName(link_id + "_UP");
linkDown = surf::LinkImpl::byName(link_id + "_DOWN");
} else {