if (xbt_dict_get_or_null (filter, aux2)) return;
//ok, not found, register it
- xbt_dict_set (filter, aux1, xbt_strdup ("1"), xbt_free);
- xbt_dict_set (filter, aux2, xbt_strdup ("1"), xbt_free);
+ xbt_dict_set (filter, aux1, xbt_strdup ("1"), NULL);
+ xbt_dict_set (filter, aux2, xbt_strdup ("1"), NULL);
}
//declare type
type_t link_type = getLinkType (link_typename, father->type, src->type, dst->type);
//register EDGE types for triva configuration
- xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), xbt_free);
+ xbt_dict_set (trivaEdgeTypes, link_type->name, xbt_strdup("1"), NULL);
//create the link
static long long counter = 0;
xbt_ex_t e;
TRY {
- route = routing_get_route(child1_name, child2_name);
+ routing_get_route_and_latency(child1_name, child2_name, &route, NULL);
} CATCH(e) {
xbt_ex_free(e);
}
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
- route_t route = rc->get_route (rc, child1_name, child2_name);
+ route_t route = xbt_new0(s_route_t,1);
+ route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+ rc->get_route_and_latency (rc, child1_name, child2_name, route,NULL);
unsigned int cpt;
void *link;
container_t previous = getContainerByName(route->src_gateway);
}
container_t last = getContainerByName(route->dst_gateway);
linkContainers (container, previous, last, filter);
+ generic_free_route(route);
}
}
}
static void instr_routing_parse_start_AS (const char*id,const char*routing)
{
if (getRootContainer() == NULL){
+ instr_paje_init ();
container_t root = newContainer (id, INSTR_AS, NULL);
- instr_paje_init (root);
+ instr_paje_set_root (root);
+
if (TRACE_smpi_is_enabled()) {
if (!TRACE_smpi_is_grouped()){
getLinkType ("MSG_PROCESS_LINK", getRootType(), msg_process, msg_process);
getLinkType ("MSG_PROCESS_TASK_LINK", getRootType(), msg_process, msg_process);
}
-
- if (TRACE_msg_task_is_enabled()) {
- type_t msg_task = getContainerType ("MSG_TASK", new->type);
- type_t state = getStateType ("MSG_TASK_STATE", msg_task);
- getValue ("MSG_task_execute", "0 1 0", state);
- getValue ("created", "1 1 0", state);
- getLinkType ("MSG_TASK_LINK", getRootType(), msg_task, msg_task);
- }
}
static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router)
{
xbt_dynar_free(¤tContainer);
currentContainer = NULL;
- xbt_dict_t filter = xbt_dict_new ();
+ xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free);
recursiveGraphExtraction (global_routing->root, getRootContainer(), filter);
xbt_dict_free(&filter);
platform_created = 1;
(child2->kind == INSTR_HOST || child2->kind == INSTR_ROUTER) &&
strcmp (child1_name, child2_name) != 0){
- xbt_dynar_t route = routing_get_route (child1_name, child2_name);
+ // FIXME factorize route creation with else branch below (once possible)
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency (child1_name, child2_name,&route,NULL);
if (TRACE_onelink_only()){
if (xbt_dynar_length (route) > 1) continue;
}
child2->kind == INSTR_AS &&
strcmp(child1_name, child2_name) != 0){
- route_t route = rc->get_route (rc, child1_name, child2_name);
+ route_t route = xbt_new0(s_route_t,1);
+ route->link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+ rc->get_route_and_latency (rc, child1_name, child2_name,route, NULL);
unsigned int cpt;
void *link;
xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, nodes);
}
current = new_xbt_graph_node(graph, route->dst_gateway, nodes);
new_xbt_graph_edge (graph, previous, current, edges);
+ generic_free_route(route);
}
}
}
xbt_graph_t instr_routing_platform_graph (void)
{
xbt_graph_t ret = xbt_graph_new_graph (0, NULL);
- xbt_dict_t nodes = xbt_dict_new ();
- xbt_dict_t edges = xbt_dict_new ();
+ xbt_dict_t nodes = xbt_dict_new_homogeneous(NULL);
+ xbt_dict_t edges = xbt_dict_new_homogeneous(NULL);
recursiveXBTGraphExtraction (ret, nodes, edges, global_routing->root, getRootContainer());
return ret;
}