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)
{
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);
+ info = xbt_dynar_get_as(privateLinks_, src->id() * nb_links_per_node_, s_surf_parsing_link_up_down_t);
route->link_list->push_back(info.link_up);
if (lat)
*lat += info.link_up->getLatency();
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);
+ info = xbt_dynar_get_as(privateLinks_, src->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
route->link_list->push_back((Link*)info.link_up);
}
- info = xbt_dynar_get_as(upDownLinks, src->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(privateLinks_, 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);
if (lat)
}
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() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
if (info.link_down) { // link down
route->link_list->push_back(info.link_down);
*lat += info.link_down->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);
+ info = xbt_dynar_get_as(privateLinks_, dst->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
route->link_list->push_back(info.link_up);
}
}
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
}
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.link_up = 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.link_down = 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.link_up = info.link_down = Link::byName(link_id);
}
- xbt_dynar_set(upDownLinks, position, &info);
+ xbt_dynar_set(privateLinks_, position, &info);
xbt_free(link_id);
}