* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/routing/AsCluster.hpp"
+#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
{
}
-void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
+void AsCluster::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
{
- s_surf_parsing_link_up_down_t info;
- XBT_VERB("cluster_get_route_and_latency from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(),
- dst->name().c_str(), dst->id());
+ XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->cname(), src->id(), dst->cname(), dst->id());
xbt_assert(!privateLinks_.empty(),
"Cluster routing: no links attached to the source node - did you use host_link tag?");
if (! src->isRouter()) { // No specific link for router
if((src->id() == dst->id()) && hasLoopback_ ){
- info = privateLinks_.at(src->id() * linkCountPerNode_);
- route->link_list->push_back(info.linkUp);
+ std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_);
+ route->link_list->push_back(info.first);
if (lat)
- *lat += info.linkUp->latency();
+ *lat += info.first->latency();
return;
}
if (hasLimiter_){ // limiter for sender
- info = privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_?1:0));
- route->link_list->push_back(info.linkUp);
+ std::pair<Link*, Link*> info = privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0));
+ route->link_list->push_back(info.first);
}
- info = privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_?1:0) + (hasLimiter_?1:0));
- if (info.linkUp) { // link up
- route->link_list->push_back(info.linkUp);
+ std::pair<Link*, Link*> info =
+ privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0));
+ if (info.first) { // link up
+ route->link_list->push_back(info.first);
if (lat)
- *lat += info.linkUp->latency();
+ *lat += info.first->latency();
}
}
}
if (! dst->isRouter()) { // No specific link for router
- info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_);
+ std::pair<Link*, Link*> info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_);
- if (info.linkDown) { // link down
- route->link_list->push_back(info.linkDown);
+ if (info.second) { // link down
+ route->link_list->push_back(info.second);
if (lat)
- *lat += info.linkDown->latency();
+ *lat += info.second->latency();
}
if (hasLimiter_){ // limiter for receiver
info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
- route->link_list->push_back(info.linkUp);
+ route->link_list->push_back(info.first);
}
}
}
void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
{
xbt_node_t current, previous, backboneNode = nullptr;
- s_surf_parsing_link_up_down_t info;
+ std::pair<Link*, Link*> info;
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_->name().c_str(), nodes);
+ xbt_node_t routerNode = new_xbt_graph_node(graph, router_->cname(), nodes);
if(backbone_) {
const char *link_nameR = backbone_->getName();
for (auto src: vertices_){
if (! src->isRouter()) {
- previous = new_xbt_graph_node(graph, src->name().c_str(), nodes);
+ previous = new_xbt_graph_node(graph, src->cname(), nodes);
info = privateLinks_.at(src->id());
- if (info.linkUp) { // link up
- const char *link_name = static_cast<simgrid::surf::Resource*>(info.linkUp)->getName();
+ if (info.first) { // link up
+ const char* link_name = static_cast<simgrid::surf::Resource*>(info.first)->getName();
current = new_xbt_graph_node(graph, link_name, nodes);
new_xbt_graph_edge(graph, previous, current, edges);
}
}
- if (info.linkDown) { // link down
- const char *link_name = static_cast<simgrid::surf::Resource*>(
- info.linkDown)->getName();
+ if (info.second) { // link down
+ const char* link_name = static_cast<simgrid::surf::Resource*>(info.second)->getName();
current = new_xbt_graph_node(graph, link_name, nodes);
new_xbt_graph_edge(graph, previous, current, edges);
info.linkUp = Link::byName(link_id);
info.linkDown = info.linkUp;
}
- privateLinks_.insert({position, info});
+ privateLinks_.insert({position, {info.linkUp, info.linkDown}});
xbt_free(link_id);
}