Merge conflicts in instr_routing.c

diff --cc buildtools/Cmake/DefinePackages.cmake
Simple merge

diff --cc include/instr/instr.h
Simple merge

diff --cc include/msg/msg.h
Simple merge

diff --cc src/instr/instr_config.c
Simple merge

diff --cc src/instr/instr_interface.c
Simple merge

diff --cc src/instr/instr_private.h
Simple merge

diff --cc src/instr/instr_routing.c
index d8649af,0dbd2c4..23a6553
--- 1/src/instr/instr_routing.c
--- 2/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@@ -133,18 -156,13 +156,23 @@@ static void recursiveGraphExtraction (A
    container_t child1, child2;
    const char *child1_name, *child2_name;
    xbt_dict_foreach(container->children, cursor1, child1_name, child1) {
 -    if (graph_extraction_filter_out (child1, NULL)) continue;
 +    //if child1 is not a link, a smpi node, a msg process, a msg vm or a msg task
 +    if (child1->kind == INSTR_LINK || child1->kind == INSTR_SMPI || child1->kind == INSTR_MSG_PROCESS || child1->kind == INSTR_MSG_VM || child1->kind == INSTR_MSG_TASK) continue;
 +
 +    xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
 +      //if child2 is not a link, a smpi node, a msg process, a msg vm or a msg task
 +      if (child2->kind == INSTR_LINK || child2->kind == INSTR_SMPI || child2->kind == INSTR_MSG_PROCESS || child2->kind == INSTR_MSG_VM || child2->kind == INSTR_MSG_TASK) continue;
 +
 +      //if child1 is not child2
 +      if (strcmp (child1_name, child2_name) == 0) continue;
 +
++      if (graph_extraction_filter_out (child1, NULL)) continue;
+     xbt_dict_foreach(container->children, cursor2, child2_name, child2) {
+       if (graph_extraction_filter_out (child2, child1)) continue;
+       XBT_DEBUG ("get_route from %s to %s", child1_name, child2_name);
+ 
        //get the route
-       route_t route = xbt_new0(s_route_t,1);
+       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);
        rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm,
                                  route, NULL);

diff --cc src/msg/msg_private.h
Simple merge

diff --cc src/surf/simgrid_dtd.c
Simple merge