xbt_dynar_t AsDijkstra::getOnelinkRoutes()
{
- xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free);
+ xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free_f);
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
int nr_nodes = xbt_dynar_length(nodes);
cost_arr = xbt_new0(double, nr_nodes); /* link cost from src to other hosts */
pred_arr = xbt_new0(int, nr_nodes); /* predecessors in path from src */
- pqueue = xbt_heap_new(nr_nodes, xbt_free);
+ pqueue = xbt_heap_new(nr_nodes, xbt_free_f);
/* initialize */
cost_arr[src_node_id] = 0.0;
AsDijkstra::~AsDijkstra()
{
- xbt_graph_free_graph(p_routeGraph, &xbt_free,
- &graph_edge_data_free, &xbt_free);
+ xbt_graph_free_graph(p_routeGraph, &xbt_free_f,
+ &graph_edge_data_free, &xbt_free_f);
xbt_dict_free(&p_graphNodeMap);
if (m_cached)
xbt_dict_free(&p_routeCache);
route->gw_src->getName(), dst, route->gw_dst->getName());
as_route = 1;
if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL)
- xbt_die("The gw_dst '%s' does not exist!",route->gw_dst->getName());
+ surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->getName());
if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL)
- xbt_die("The gw_src '%s' does not exist!",route->gw_src->getName());
+ surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->getName());
}
RoutingEdgePtr src_net_elm, dst_net_elm;