/* create a result route */
xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), NULL);
int pred;
- int cur = dst->getId();
+ int cur = dst->id();
do {
- pred = TO_FLOYD_PRED(src->getId(), cur);
+ pred = TO_FLOYD_PRED(src->id(), cur);
if (pred == -1)
- THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getName(), dst->getName());
+ THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name(), dst->name());
xbt_dynar_push_as(route_stack, sg_platf_route_cbarg_t, TO_FLOYD_LINK(pred, cur));
cur = pred;
- } while (cur != src->getId());
+ } while (cur != src->id());
if (hierarchy_ == SURF_ROUTING_RECURSIVE) {
res->gw_src = xbt_dynar_getlast_as(route_stack, sg_platf_route_cbarg_t)->gw_src;
unsigned int cpt;
if (hierarchy_ == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL
- && strcmp(prev_dst_gw->getName(), e_route->gw_src->getName())) {
+ && strcmp(prev_dst_gw->name(), e_route->gw_src->name())) {
routing_platf->getRouteAndLatency(prev_dst_gw, e_route->gw_src,
&res->link_list, lat);
}
else{
as_route = 1;
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
- route->gw_src->getName(), dst, route->gw_dst->getName());
+ route->gw_src->name(), dst, route->gw_dst->name());
if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)
- surf_parse_error("The dst_gateway '%s' does not exist!",route->gw_dst->getName());
+ surf_parse_error("The dst_gateway '%s' does not exist!",route->gw_dst->name());
if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)
- surf_parse_error("The src_gateway '%s' does not exist!",route->gw_src->getName());
+ surf_parse_error("The src_gateway '%s' does not exist!",route->gw_src->name());
}
- if(TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId()))
+ if(TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id()))
{
char * link_name;
xbt_dynar_push(link_route_to_test,&link);
}
xbt_assert(!xbt_dynar_compare(
- TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId())->link_list,
+ TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id())->link_list,
link_route_to_test,
(int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists", src,dst);
}
else
{
- TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId()) =
+ TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id()) =
newExtendedRoute(hierarchy_, route, 1);
- TO_FLOYD_PRED(src_net_elm->getId(), dst_net_elm->getId()) = src_net_elm->getId();
- TO_FLOYD_COST(src_net_elm->getId(), dst_net_elm->getId()) =
- ((TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId()))->link_list)->used; /* count of links, old model assume 1 */
+ TO_FLOYD_PRED(src_net_elm->id(), dst_net_elm->id()) = src_net_elm->id();
+ TO_FLOYD_COST(src_net_elm->id(), dst_net_elm->id()) =
+ ((TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id()))->link_list)->used; /* count of links, old model assume 1 */
}
if ( (route->symmetrical == TRUE && as_route == 0)
|| (route->symmetrical == TRUE && as_route == 1)
)
{
- if(TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()))
+ if(TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()))
{
if(!route->gw_dst && !route->gw_src)
XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
else
XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
- route->gw_src->getName(), src, route->gw_dst->getName());
+ route->gw_src->name(), src, route->gw_dst->name());
char * link_name;
unsigned int i;
xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
xbt_dynar_push(link_route_to_test,&link);
}
xbt_assert(!xbt_dynar_compare(
- TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId())->link_list,
+ TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id())->link_list,
link_route_to_test,
(int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists", src,dst);
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
else
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
- route->gw_src->getName(), src, route->gw_dst->getName());
+ route->gw_src->name(), src, route->gw_dst->name());
- TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()) =
+ TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()) =
newExtendedRoute(hierarchy_, route, 0);
- TO_FLOYD_PRED(dst_net_elm->getId(), src_net_elm->getId()) = dst_net_elm->getId();
- TO_FLOYD_COST(dst_net_elm->getId(), src_net_elm->getId()) =
- ((TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()))->link_list)->used; /* count of links, old model assume 1 */
+ TO_FLOYD_PRED(dst_net_elm->id(), src_net_elm->id()) = dst_net_elm->id();
+ TO_FLOYD_COST(dst_net_elm->id(), src_net_elm->id()) =
+ ((TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()))->link_list)->used; /* count of links, old model assume 1 */
}
}
xbt_dynar_free(&route->link_list);