* Note that a router is created, easing the interconnexion with the rest of the world. */
namespace simgrid {
+namespace kernel {
namespace routing {
- AsCluster::AsCluster(const char*name)
- : AsImpl(name)
- {}
- AsCluster::~AsCluster()
- {
- xbt_dynar_free(&privateLinks_);
- }
+AsCluster::AsCluster(As* father, const char* name) : AsImpl(father, name)
+{
+}
-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(), src->id(), dst->name(), dst->id());
- xbt_assert(!xbt_dynar_is_empty(privateLinks_), "Cluster routing : no links attached to the source node - did you use host_link tag?");
+ XBT_VERB("cluster getLocalRoute from '%s'[%d] to '%s'[%d]", src->name().c_str(), src->id(), dst->name().c_str(),
+ 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 = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_, s_surf_parsing_link_up_down_t);
+ s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id() * linkCountPerNode_);
route->link_list->push_back(info.linkUp);
if (lat)
- *lat += info.linkUp->getLatency();
+ *lat += info.linkUp->latency();
return;
}
-
if (hasLimiter_){ // limiter for sender
- info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_ + (hasLoopback_?1:0), s_surf_parsing_link_up_down_t);
- route->link_list->push_back((Link*)info.linkUp);
+ s_surf_parsing_link_up_down_t info = privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0));
+ route->link_list->push_back(info.linkUp);
}
- info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_ + (hasLoopback_?1:0) + (hasLimiter_?1:0), s_surf_parsing_link_up_down_t);
+ s_surf_parsing_link_up_down_t info =
+ privateLinks_.at(src->id() * linkCountPerNode_ + (hasLoopback_ ? 1 : 0) + (hasLimiter_ ? 1 : 0));
if (info.linkUp) { // link up
route->link_list->push_back(info.linkUp);
if (lat)
- *lat += info.linkUp->getLatency();
+ *lat += info.linkUp->latency();
}
}
if (backbone_) {
route->link_list->push_back(backbone_);
if (lat)
- *lat += backbone_->getLatency();
+ *lat += backbone_->latency();
}
if (! dst->isRouter()) { // No specific link for router
- info = xbt_dynar_get_as(privateLinks_, dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_, s_surf_parsing_link_up_down_t);
+ s_surf_parsing_link_up_down_t info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_);
if (info.linkDown) { // link down
route->link_list->push_back(info.linkDown);
if (lat)
- *lat += info.linkDown->getLatency();
+ *lat += info.linkDown->latency();
}
if (hasLimiter_){ // limiter for receiver
- info = xbt_dynar_get_as(privateLinks_, dst->id() * linkCountPerNode_ + hasLoopback_, s_surf_parsing_link_up_down_t);
+ info = privateLinks_.at(dst->id() * linkCountPerNode_ + hasLoopback_);
route->link_list->push_back(info.linkUp);
}
}
void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
{
- int isrc;
- int table_size = xbt_dynar_length(vertices_);
-
- NetCard *src;
- xbt_node_t current, previous, backboneNode = nullptr, routerNode;
+ xbt_node_t current, previous, backboneNode = nullptr;
s_surf_parsing_link_up_down_t 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 */
- char *link_name = router_->name();
- routerNode = new_xbt_graph_node(graph, link_name, nodes);
+ xbt_node_t routerNode = new_xbt_graph_node(graph, router_->name().c_str(), nodes);
if(backbone_) {
const char *link_nameR = backbone_->getName();
new_xbt_graph_edge(graph, routerNode, backboneNode, edges);
}
- for (isrc = 0; isrc < table_size; isrc++) {
- src = xbt_dynar_get_as(vertices_, isrc, NetCard*);
-
+ for (auto src: vertices_){
if (! src->isRouter()) {
- previous = new_xbt_graph_node(graph, src->name(), nodes);
+ previous = new_xbt_graph_node(graph, src->name().c_str(), nodes);
- info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t);
+ info = privateLinks_.at(src->id());
if (info.linkUp) { // link up
-
- const char *link_name = static_cast<simgrid::surf::Resource*>(
- info.linkUp)->getName();
+ const char *link_name = static_cast<simgrid::surf::Resource*>(info.linkUp)->getName();
current = new_xbt_graph_node(graph, link_name, nodes);
new_xbt_graph_edge(graph, previous, current, edges);
} else {
new_xbt_graph_edge(graph, current, routerNode, edges);
}
-
}
if (info.linkDown) { // link down
}
}
}
-
}
}
info.linkUp = Link::byName(link_id);
info.linkDown = info.linkUp;
}
- xbt_dynar_set(privateLinks_, position, &info);
+ privateLinks_.insert({position, info});
xbt_free(link_id);
}
-}
-}
+}}}