X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/997eaf52ad0ae1eb34820b135c7ba884b2a17f3c..a7dc4456f42a853a6294c774ccc9397304732c6e:/src/instr/jedule/jedule_sd_binding.c diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.c index 9ecf7cba9d..e5c51c642c 100644 --- a/src/instr/jedule/jedule_sd_binding.c +++ b/src/instr/jedule/jedule_sd_binding.c @@ -12,6 +12,7 @@ #include "xbt/dynar.h" #include "surf/surf_private.h" +#include "surf/surf_resource.h" #include "surf/surf.h" #include "instr/jedule/jedule_sd_binding.h" @@ -56,6 +57,7 @@ void jedule_log_sd_event(SD_task_t task) { static void create_hierarchy(AS_t current_comp, jed_simgrid_container_t current_container) { xbt_dict_cursor_t cursor = NULL; + unsigned int dynar_cursor; char *key; AS_t elem; network_element_t network_elem; @@ -67,11 +69,10 @@ static void create_hierarchy(AS_t current_comp, hosts = xbt_dynar_new(sizeof(char*), NULL); - xbt_dict_foreach(current_comp->to_index, cursor, key, network_elem) { + xbt_dynar_foreach(current_comp->index_network_elm, + dynar_cursor, network_elem) { char *hostname; - XBT_DEBUG("key %s value %p\n", key, network_elem); - //xbt_dynar_push_as(hosts, char*, key); - hostname = strdup(key); + hostname = strdup(network_elem->name); xbt_dynar_push(hosts, &hostname); } @@ -119,8 +120,6 @@ void jedule_sd_cleanup() { void jedule_sd_init() { - XBT_LOG_CONNECT(jed_sd, jedule); - jedule_init_output(); }