- xbt_dict_cursor_t cursor = NULL;
- char *key, *data;
-
-// COMMENTED BY DAVID
-// xbt_dict_t onelink_routes = used_routing->get_onelink_routes();
-// xbt_assert0(onelink_routes, "Error onelink_routes was not initialized");
-//
-// DEBUG0("Starting topology generation");
-//
-// xbt_dict_foreach(onelink_routes, cursor, key, data){
-// s_onelink_t link = (s_onelink_t) data;
-//
-// DEBUG3("Link (#%d), src (#%d), dst (#%d)", ((network_link_GTNETS_t)(link->link_ptr))->id , link->src_id, link->dst_id);
-// DEBUG0("Calling one link route");
-// if(used_routing->is_router(link->src_id)){
-// gtnets_add_router(link->src_id);
-// }
-// if(used_routing->is_router(link->dst_id)){
-// gtnets_add_router(link->dst_id);
-// }
-// route_onehop_new(link->src_id, link->dst_id, (network_link_GTNETS_t)(link->link_ptr));
-// }
-//
-// xbt_dict_free(&route_table);
-// if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
-// gtnets_print_topology();
-// }
+ int src_id,dst_id;
+
+ XBT_DEBUG("Starting topology generation");
+// À refaire plus tard. Il faut prendre la liste des hôtes/routeurs (dans routing)
+// À partir de cette liste, on les numérote.
+// Ensuite, on peut utiliser les id pour refaire les appels GTNets qui suivent.
+
+ //get the onelinks from the parsed platform
+ xbt_dynar_t onelink_routes = global_routing->get_onelink_routes();
+ if (!onelink_routes)
+ return;
+
+ //save them in trace file
+ onelink_t onelink;
+ unsigned int iter;
+ xbt_dynar_foreach(onelink_routes, iter, onelink) {
+ char *src = onelink->src;
+ char *dst = onelink->dst;
+ void *link = onelink->link_ptr;
+ src_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src));
+ dst_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst));
+
+ if(src_id != dst_id){
+ XBT_DEBUG("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", link,src,dst, src_id, dst_id);
+ XBT_DEBUG("Calling one link route");
+ if(global_routing->get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
+ gtnets_add_router(src_id);
+ }
+ if(global_routing->get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+ gtnets_add_router(dst_id);
+ }
+ route_onehop_new(src_id, dst_id, (network_link_GTNETS_t)(link));
+ }
+ }