rename routing_component to as, since that's just an AS at the end of the day

[simgrid.git] / 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 52a8398..8cf0f77 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -53,11 +53,11 @@ 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;
        char *key;
-       routing_component_t elem;
+       AS_t elem;
        network_element_t network_elem;
 
        if( xbt_dict_length(current_comp->routing_sons) == 0 ) {
@@ -69,7 +69,7 @@ static void create_hierarchy(routing_component_t current_comp,
 
                xbt_dict_foreach(current_comp->to_index, cursor, key, network_elem) {
                        char *hostname;
-                       DEBUG2("key %s value %p\n", key, network_elem);
+                       XBT_DEBUG("key %s value %p\n", key, network_elem);
                        //xbt_dynar_push_as(hosts, char*, key);
                        hostname = strdup(key);
                        xbt_dynar_push(hosts, &hostname);
@@ -82,7 +82,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 +90,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 +99,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;