XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
/* This routing is specifically setup to represent clusters, aka homogeneous sets of machines
- * Note that a router is created, easing the interconnexion with the rest of the world.
- */
+ * Note that a router is created, easing the interconnexion with the rest of the world. */
namespace simgrid {
-namespace surf {
+namespace routing {
AsCluster::AsCluster(const char*name)
: AsImpl(name)
{}
+ AsCluster::~AsCluster()
+ {
+ xbt_dynar_free(&privateLinks_);
+ }
void AsCluster::getRouteAndLatency(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?");
if (! src->isRouter()) { // No specific link for router
- if((src->id() == dst->id()) && has_loopback_ ){
- info = xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_, s_surf_parsing_link_up_down_t);
- route->link_list->push_back(info.link_up);
+ if((src->id() == dst->id()) && hasLoopback_ ){
+ info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_, s_surf_parsing_link_up_down_t);
+ route->link_list->push_back(info.linkUp);
if (lat)
- *lat += info.link_up->getLatency();
+ *lat += info.linkUp->getLatency();
return;
}
- if (has_limiter_){ // limiter for sender
- info = xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
- route->link_list->push_back((Link*)info.link_up);
+ 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);
}
- info = xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
- if (info.link_up) { // link up
- route->link_list->push_back(info.link_up);
+ info = xbt_dynar_get_as(privateLinks_, src->id() * linkCountPerNode_ + (hasLoopback_?1:0) + (hasLimiter_?1:0), s_surf_parsing_link_up_down_t);
+ if (info.linkUp) { // link up
+ route->link_list->push_back(info.linkUp);
if (lat)
- *lat += info.link_up->getLatency();
+ *lat += info.linkUp->getLatency();
}
}
}
if (! dst->isRouter()) { // No specific link for router
- info = xbt_dynar_get_as(upDownLinks, dst->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(privateLinks_, dst->id() * linkCountPerNode_ + hasLoopback_ + hasLimiter_, s_surf_parsing_link_up_down_t);
- if (info.link_down) { // link down
- route->link_list->push_back(info.link_down);
+ if (info.linkDown) { // link down
+ route->link_list->push_back(info.linkDown);
if (lat)
- *lat += info.link_down->getLatency();
+ *lat += info.linkDown->getLatency();
}
- if (has_limiter_){ // limiter for receiver
- info = xbt_dynar_get_as(upDownLinks, dst->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
- route->link_list->push_back(info.link_up);
+ if (hasLimiter_){ // limiter for receiver
+ info = xbt_dynar_get_as(privateLinks_, dst->id() * linkCountPerNode_ + hasLoopback_, s_surf_parsing_link_up_down_t);
+ route->link_list->push_back(info.linkUp);
}
}
}
int table_size = xbt_dynar_length(vertices_);
NetCard *src;
- xbt_node_t current, previous, backboneNode = NULL, routerNode;
+ xbt_node_t current, previous, backboneNode = nullptr, routerNode;
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.");
if (! src->isRouter()) {
previous = new_xbt_graph_node(graph, src->name(), nodes);
- info = xbt_dynar_get_as(upDownLinks, src->id(), s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(privateLinks_, src->id(), s_surf_parsing_link_up_down_t);
- if (info.link_up) { // link up
+ if (info.linkUp) { // link up
const char *link_name = static_cast<simgrid::surf::Resource*>(
- info.link_up)->getName();
+ info.linkUp)->getName();
current = new_xbt_graph_node(graph, link_name, nodes);
new_xbt_graph_edge(graph, previous, current, edges);
}
- if (info.link_down) { // link down
+ if (info.linkDown) { // link down
const char *link_name = static_cast<simgrid::surf::Resource*>(
- info.link_down)->getName();
+ info.linkDown)->getName();
current = new_xbt_graph_node(graph, link_name, nodes);
new_xbt_graph_edge(graph, previous, current, edges);
}
void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int , int position){
- s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
s_surf_parsing_link_up_down_t info;
char* link_id = bprintf("%s_link_%d", cluster->id, id);
+ s_sg_platf_link_cbarg_t link;
memset(&link, 0, sizeof(link));
link.id = link_id;
link.bandwidth = cluster->bw;
if (link.policy == SURF_LINK_FULLDUPLEX) {
char *tmp_link = bprintf("%s_UP", link_id);
- info.link_up = sg_link_by_name(tmp_link);
+ info.linkUp = Link::byName(tmp_link);
xbt_free(tmp_link);
tmp_link = bprintf("%s_DOWN", link_id);
- info.link_down = sg_link_by_name(tmp_link);
+ info.linkDown = Link::byName(tmp_link);
xbt_free(tmp_link);
} else {
- info.link_up = sg_link_by_name(link_id);
- info.link_down = info.link_up;
+ info.linkUp = Link::byName(link_id);
+ info.linkDown = info.linkUp;
}
- xbt_dynar_set(upDownLinks, position, &info);
+ xbt_dynar_set(privateLinks_, position, &info);
xbt_free(link_id);
}