static int platform_created = 0; /* indicate whether the platform file has been traced */
static xbt_dynar_t currentContainer = NULL; /* push and pop, used only in creation */
+static const char *instr_node_name (xbt_node_t node)
+{
+ void *data = xbt_graph_node_get_data(node);
+ char *str = (char*)data;
+ return str;
+}
+
+
static container_t lowestCommonAncestor (container_t a1, container_t a2)
{
//this is only an optimization (since most of a1 and a2 share the same parent)
if (a1->father == a2->father) return a1->father;
//create an array with all ancestors of a1
- xbt_dynar_t ancestors = xbt_dynar_new(sizeof(container_t), NULL);
+ xbt_dynar_t ancestors_a1 = xbt_dynar_new(sizeof(container_t), NULL);
container_t p;
p = a1->father;
while (p){
- xbt_dynar_push_as (ancestors, container_t, p);
+ xbt_dynar_push_as (ancestors_a1, container_t, p);
p = p->father;
}
- //find the lowest ancestor of a2 in the previously created array
+ //create an array with all ancestors of a2
+ xbt_dynar_t ancestors_a2 = xbt_dynar_new(sizeof(container_t), NULL);
p = a2->father;
while (p){
- int cpt;
- unsigned int cursor;
- xbt_dynar_foreach (ancestors, cursor, cpt){
- container_t pp = *(container_t*)xbt_dynar_get_ptr(ancestors, cursor);
- if (p == pp){
- return p;
- }
- }
+ xbt_dynar_push_as (ancestors_a2, container_t, p);
p = p->father;
}
- //not common ancestor found, return NULL
- return NULL;
+ //find the lowest ancestor
+ p = NULL;
+ int i = xbt_dynar_length (ancestors_a1) - 1;
+ int j = xbt_dynar_length (ancestors_a2) - 1;
+ while (i >= 0 && j >= 0){
+ container_t a1p = *(container_t*)xbt_dynar_get_ptr (ancestors_a1, i);
+ container_t a2p = *(container_t*)xbt_dynar_get_ptr (ancestors_a2, j);
+ if (a1p == a2p){
+ p = a1p;
+ }else{
+ break;
+ }
+ i--;
+ j--;
+ }
+ xbt_dynar_free (&ancestors_a1);
+ xbt_dynar_free (&ancestors_a2);
+ return p;
}
-static void linkContainers (container_t father, container_t src, container_t dst, xbt_dict_t filter)
+static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
{
//ignore loopback
if (strcmp (src->name, "__loopback__") == 0 || strcmp (dst->name, "__loopback__") == 0)
//declare type
char link_typename[INSTR_DEFAULT_STR_SIZE];
- snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s", src->type->name, dst->type->name);
+ snprintf (link_typename, INSTR_DEFAULT_STR_SIZE, "%s-%s%s-%s%s",
+ father->type->name,
+ src->type->name, src->type->id,
+ dst->type->name, dst->type->id);
type_t link_type = PJ_type_get_or_null (link_typename, father->type);
if (link_type == NULL){
link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type);
xbt_ex_t e;
TRY {
- routing_get_route_and_latency(child1_name, child2_name, &route, NULL);
+ routing_get_route_and_latency((network_element_t)(child1->net_elm),
+ (network_element_t)(child2->net_elm),
+ &route, NULL);
} CATCH(e) {
xbt_ex_free(e);
}
link_CM02_t *link = ((link_CM02_t*)xbt_dynar_get_ptr (route, i));
char *link_name = (*link)->lmm_resource.generic_resource.name;
container_t current = PJ_container_get(link_name);
- linkContainers(container, previous, current, filter);
+ linkContainers(previous, current, filter);
previous = current;
}
- linkContainers(container, previous, child2, filter);
+ linkContainers(previous, child2, filter);
}else if (child1->kind == INSTR_AS &&
child2->kind == INSTR_AS &&
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);
+ rc->get_route_and_latency (rc,
+ (network_element_t)(child1->net_elm),
+ (network_element_t)(child2->net_elm), route,NULL);
unsigned int cpt;
void *link;
- container_t previous = PJ_container_get(route->src_gateway);
+ container_t previous = PJ_container_get(route->src_gateway->name);
xbt_dynar_foreach (route->link_list, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
container_t current = PJ_container_get(link_name);
- linkContainers (container, previous, current, filter);
+ linkContainers (previous, current, filter);
previous = current;
}
- container_t last = PJ_container_get(route->dst_gateway);
- linkContainers (container, previous, last, filter);
+ container_t last = PJ_container_get(route->dst_gateway->name);
+ linkContainers (previous, last, filter);
generic_free_route(route);
}
}
xbt_edge_t ret;
char *name;
- const char *sn = TRACE_node_name (s);
- const char *dn = TRACE_node_name (d);
+ const char *sn = instr_node_name (s);
+ const char *dn = instr_node_name (d);
name = bprintf ("%s%s", sn, dn);
ret = xbt_dict_get_or_null (edges, 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);
+ routing_get_route_and_latency ((network_element_t)(child1->net_elm),
+ (network_element_t)(child2->net_elm),
+ &route,NULL);
if (TRACE_onelink_only()){
if (xbt_dynar_length (route) > 1) continue;
}
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);
+ rc->get_route_and_latency (rc,
+ (network_element_t)(child1->net_elm),
+ (network_element_t)(child2->net_elm),route, NULL);
unsigned int cpt;
void *link;
- xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway, nodes);
+ xbt_node_t current, previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes);
xbt_dynar_foreach (route->link_list, cpt, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
current = new_xbt_graph_node(graph, link_name, nodes);
//previous -> current
previous = current;
}
- current = new_xbt_graph_node(graph, route->dst_gateway, nodes);
+ current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes);
new_xbt_graph_edge (graph, previous, current, edges);
generic_free_route(route);
}
" node [width=.3, height=.3, style=filled, color=skyblue]\n\n");
xbt_dynar_foreach(g->nodes, cursor, node) {
- fprintf(file, " \"%s\";\n", TRACE_node_name(node));
+ fprintf(file, " \"%s\";\n", instr_node_name(node));
}
xbt_dynar_foreach(g->edges, cursor, edge) {
- const char *src_s = TRACE_node_name (edge->src);
- const char *dst_s = TRACE_node_name (edge->dst);
+ const char *src_s = instr_node_name (edge->src);
+ const char *dst_s = instr_node_name (edge->dst);
if (g->directed)
fprintf(file, " \"%s\" -> \"%s\";\n", src_s, dst_s);
else
