}
static int cluster_parse_PU(AS_t rc, network_element_t elm) {
- xbt_dynar_push(rc->index_network_elm, (void *)elm);
+ XBT_DEBUG("Load process unit \"%s\"", elm->name);
+ xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);
return xbt_dynar_length(rc->index_network_elm)-1;
}
static int cluster_parse_AS(AS_t rc, network_element_t elm) {
- xbt_dynar_push(rc->index_network_elm, (void *)elm);
+ XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
+ xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);
return xbt_dynar_length(rc->index_network_elm)-1;
}
void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
onelink_t onelink = xbt_new0(s_onelink_t, 1);
onelink->link_ptr = link;
- if (routing->generic_routing.hierarchy == SURF_ROUTING_BASE) {
- onelink->src = xbt_dynar_get_as(routing->generic_routing.index_network_elm,src,network_element_t);
+ if (rc->hierarchy == SURF_ROUTING_BASE) {
+ onelink->src = xbt_dynar_get_as(rc->index_network_elm,src,network_element_t);
onelink->src->id = src;
- onelink->dst = xbt_dynar_get_as(routing->generic_routing.index_network_elm,dst,network_element_t);
+ onelink->dst = xbt_dynar_get_as(rc->index_network_elm,dst,network_element_t);
onelink->dst->id = dst;
- } else if (routing->generic_routing.hierarchy ==
- SURF_ROUTING_RECURSIVE) {
+ } else if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {
onelink->src = route->src_gateway;
onelink->dst = route->dst_gateway;
}
xbt_dynar_push(ret, &onelink);
+ XBT_DEBUG("Push route from '%d' to '%d'",
+ src,
+ dst);
}
}
}
int generic_parse_PU(AS_t as, network_element_t elm)
{
XBT_DEBUG("Load process unit \"%s\"", elm->name);
- xbt_dynar_push(as->index_network_elm, elm);
+ xbt_dynar_push_as(as->index_network_elm,network_element_t,elm);
return xbt_dynar_length(as->index_network_elm)-1;
}
int generic_parse_AS(AS_t as, network_element_t elm)
{
XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
- xbt_dynar_push(as->index_network_elm, elm);
+ xbt_dynar_push_as(as->index_network_elm,network_element_t,elm);
return xbt_dynar_length(as->index_network_elm)-1;
}
}
static int none_parse_PU(AS_t rc, network_element_t elm) {
- xbt_dynar_push(rc->index_network_elm, (void *)elm);
+ XBT_DEBUG("Load process unit \"%s\"", elm->name);
+ xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);
/* don't care about PUs */
return -1;
}
static int none_parse_AS(AS_t rc, network_element_t elm) {
- xbt_dynar_push(rc->index_network_elm, (void *)elm);
+ XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
+ xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);
/* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
return -1;
}