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
4cf5cb9
..
33e0863
100644
(file)
--- a/
src/kernel/routing/ClusterZone.cpp
+++ b/
src/kernel/routing/ClusterZone.cpp
@@
-20,17
+20,17
@@
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->
cname(), src->id(), dst->c
name(), dst->id());
+ XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->
getCname(), src->id(), dst->getC
name(), dst->id());
xbt_assert(not privateLinks_.empty(),
"Cluster routing: no links attached to the source node - did you use host_link tag?");
if ((src->id() == dst->id()) && hasLoopback_) {
xbt_assert(not src->isRouter(), "Routing from a cluster private router to itself is meaningless");
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
src->id() * linkCountPerNode_
);
- route->link_list
->
push_back(info.first);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(
nodePosition(src->id())
);
+ route->link_list
.
push_back(info.first);
if (lat)
*lat += info.first->latency();
return;
@@
-38,64
+38,62
@@
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(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0));
- route->link_list->push_back(info.first);
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(nodePositionWithLoopback(src->id()));
+ route->link_list.push_back(info.first);
}
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info =
- privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0));
+ 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();
}
if (not dst->isRouter()) { // No specific link for router
- std::pair<surf::LinkImpl*, surf::LinkImpl*> info =
- privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_);
+ 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(
dst->id() * linkCountPerNode_ + hasLoopback_
);
- route->link_list
->
push_back(info.first);
+ info = privateLinks_.at(
nodePositionWithLoopback(dst->id())
);
+ 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.");
/* create the router */
- xbt_node_t routerNode = new_xbt_graph_node(graph, router_->
c
name(), nodes);
+ xbt_node_t routerNode = new_xbt_graph_node(graph, router_->
getC
name(), nodes);
xbt_node_t backboneNode = nullptr;
if (backbone_) {
- backboneNode = new_xbt_graph_node(graph, backbone_->
c
name(), nodes);
+ backboneNode = new_xbt_graph_node(graph, backbone_->
getC
name(), nodes);
new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
}
- for (auto src : getVertices()) {
+ for (auto
const&
src : getVertices()) {
if (not src->isRouter()) {
- xbt_node_t previous = new_xbt_graph_node(graph, src->
c
name(), nodes);
+ xbt_node_t previous = new_xbt_graph_node(graph, src->
getC
name(), nodes);
std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id());
if (info.first) { // link up
- xbt_node_t current = new_xbt_graph_node(graph, info.first->
c
name(), nodes);
+ xbt_node_t current = new_xbt_graph_node(graph, info.first->
getC
name(), nodes);
new_xbt_graph_edge(graph, previous, current, edges);
if (backbone_) {
@@
-106,7
+104,7
@@
void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
}
if (info.second) { // link down
- xbt_node_t current = new_xbt_graph_node(graph, info.second->
c
name(), nodes);
+ xbt_node_t current = new_xbt_graph_node(graph, info.second->
getC
name(), nodes);
new_xbt_graph_edge(graph, previous, current, edges);
if (backbone_) {
@@
-119,9
+117,9
@@
void ClusterZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges
}
}
-void ClusterZone::create_links_for_node(
sg_platf_cluster_cbarg_t 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 =
std::string(cluster->id)
+ "_link_" + std::to_string(id);
+ std::string link_id =
cluster->id
+ "_link_" + std::to_string(id);
LinkCreationArgs link;
link.id = link_id;
@@
-132,11
+130,9
@@
void ClusterZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id
surf::LinkImpl *linkUp;
surf::LinkImpl *linkDown;
- if (link.policy == SURF_LINK_FULLDUPLEX) {
- std::string tmp_link = std::string(link_id) + "_UP";
- linkUp = surf::LinkImpl::byName(tmp_link);
- tmp_link = std::string(link_id) + "_DOWN";
- linkDown = surf::LinkImpl::byName(tmp_link);
+ if (link.policy == SURF_LINK_SPLITDUPLEX) {
+ linkUp = surf::LinkImpl::byName(link_id + "_UP");
+ linkDown = surf::LinkImpl::byName(link_id + "_DOWN");
} else {
linkUp = surf::LinkImpl::byName(link_id);
linkDown = linkUp;