- xbt_ex_t e;
- unsigned int cpt = 0;
- int link_list_capacity = 0;
- int nb_link = 0;
- xbt_dict_cursor_t cursor = NULL;
- char *key, *data, *end;
- const char *sep = "#";
- xbt_dynar_t links, keys;
- static network_link_GTNETS_t *link_list = NULL;
-
-
- XBT_IN;
- xbt_dict_foreach(route_table, cursor, key, data) {
- char *link = NULL;
- nb_link = 0;
- links = (xbt_dynar_t) data;
- keys = xbt_str_split_str(key, sep);
-
- link_list_capacity = xbt_dynar_length(links);
- link_list = xbt_new(network_link_GTNETS_t, link_list_capacity);
-
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
- xbt_dynar_free(&keys);
-
- xbt_dynar_foreach(links, cpt, link) {
- TRY {
- link_list[nb_link++] =
- xbt_dict_get(surf_network_model->resource_set, link);
- }
- CATCH(e) {
- RETHROW1("Link %s not found (dict raised this exception: %s)", link);
- }
- }
- if (nb_link == 1){
- DEBUG0("Calling a one link route");
- route_onehop_new(src_id, dst_id, link_list, nb_link);
- }
- }
-
- xbt_dict_foreach(route_table, cursor, key, data) {
- char *link = NULL;
- nb_link = 0;
- links = (xbt_dynar_t) data;
- keys = xbt_str_split_str(key, sep);
-
- link_list_capacity = xbt_dynar_length(links);
- link_list = xbt_new(network_link_GTNETS_t, link_list_capacity);
-
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
- xbt_dynar_free(&keys);
-
- xbt_dynar_foreach(links, cpt, link) {
- TRY {
- link_list[nb_link++] =
- xbt_dict_get(surf_network_model->resource_set, link);
- }
- CATCH(e) {
- RETHROW1("Link %s not found (dict raised this exception: %s)", link);
- }
- }
- if (nb_link >= 1)
- route_new(src_id, dst_id, link_list, nb_link);
- }
-
- xbt_dict_free(&route_table);
- if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
- gtnets_print_topology();
- }
- XBT_OUT;
+ XBT_DEBUG("Starting topology generation");
+// FIXME: We should take the list of hosts/routers (in the routing module), number the elements of this list,
+// and then you can use the id to reimplement properly the following GTNets calls
+
+ //get the onelinks from the parsed platform
+ xbt_dynar_t onelink_routes = routing_platf->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) {
+ void *link = onelink->link_ptr;
+
+ if(onelink->src->id != onelink->dst->id){
+ XBT_DEBUG("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d",
+ link,
+ onelink->src->name,
+ onelink->dst->name,
+ onelink->src->id,
+ onelink->dst->id);
+ XBT_DEBUG("Calling one link route");
+ if(onelink->src->rc_type == SURF_NETWORK_ELEMENT_ROUTER){
+ gtnets_add_router(onelink->src->id);
+ }
+ if(onelink->dst->rc_type == SURF_NETWORK_ELEMENT_ROUTER){
+ gtnets_add_router(onelink->dst->id);
+ }
+ route_onehop_new(onelink->src->id, onelink->dst->id, (network_link_GTNETS_t)(link));
+ }
+ }
+
+ if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
+ gtnets_print_topology();
+ }