X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fcaee754669ca60c27288a8e290c25c5accdedbb..e1e8001f74819b6ad7eed5670d2970f601f6df29:/src/instr/jedule/jedule_sd_binding.c?ds=sidebyside

diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.c
index 67a1e91ac4..7965abf4f9 100644
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -57,9 +57,10 @@ 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;
+	sg_routing_edge_t network_elem;
 
 	if(xbt_dict_is_empty(current_comp->routing_sons)) {
 		// I am no AS
@@ -68,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);
 		}
 
@@ -99,7 +99,7 @@ void jedule_setup_platform() {
 
 	jed_create_jedule(&jedule);
 
-	root_comp = global_routing->root;
+	root_comp = routing_platf->root;
 	XBT_DEBUG("root name %s\n", root_comp->name);
 
 	// that doesn't work
@@ -120,8 +120,6 @@ void jedule_sd_cleanup() {
 
 void jedule_sd_init() {
 
-	XBT_LOG_CONNECT(jed_sd, jedule);
-
 	jedule_init_output();
 }