X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/23a2059333732be618364bbd4bb149e3b1f7c112..bcd806f123a6845defe0f275027a3540b7fef6c4:/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 52a8398c7f..e992795c54 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"
@@ -53,25 +54,25 @@ void jedule_log_sd_event(SD_task_t task) {
 	xbt_dynar_free(&host_list);
 }
 
-static void create_hierarchy(routing_component_t current_comp,
+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;
-	routing_component_t elem;
-	network_element_t network_elem;
+	AS_t elem;
+	sg_routing_edge_t network_elem;
 
-	if( xbt_dict_length(current_comp->routing_sons) == 0 ) {
+	if(xbt_dict_is_empty(current_comp->routing_sons)) {
 		// I am no AS
 		// add hosts to jedule platform
 		xbt_dynar_t hosts;
 
 		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;
-			DEBUG2("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);
 		}
 
@@ -82,7 +83,7 @@ static void create_hierarchy(routing_component_t current_comp,
 			jed_simgrid_container_t child_container;
 			jed_simgrid_create_container(&child_container, elem->name);
 			jed_simgrid_add_container(current_container, child_container);
-			DEBUG1("name : %s\n", elem->name);
+			XBT_DEBUG("name : %s\n", elem->name);
 			create_hierarchy(elem, child_container);
 		}
 	}
@@ -90,8 +91,8 @@ static void create_hierarchy(routing_component_t current_comp,
 
 void jedule_setup_platform() {
 
-	routing_component_t root_comp;
-	e_surf_network_element_type_t type;
+	AS_t root_comp;
+	// e_surf_network_element_type_t type;
 
 	jed_simgrid_container_t root_container;
 
@@ -99,10 +100,10 @@ void jedule_setup_platform() {
 	jed_create_jedule(&jedule);
 
 	root_comp = global_routing->root;
-	DEBUG1("root name %s\n", root_comp->name);
+	XBT_DEBUG("root name %s\n", root_comp->name);
 
 	// that doesn't work
-	type = root_comp->get_network_element_type(root_comp->name);
+	// type = root_comp->get_network_element_type(root_comp->name);
 
 	jed_simgrid_create_container(&root_container, root_comp->name);
 	jedule->root_container = root_container;
@@ -119,8 +120,6 @@ void jedule_sd_cleanup() {
 
 void jedule_sd_init() {
 
-	XBT_LOG_CONNECT(jed_sd, jedule);
-
 	jedule_init_output();
 }