#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"
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;
- 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);
}
void jedule_setup_platform() {
- routing_component_t root_comp;
+ AS_t root_comp;
// e_surf_network_element_type_t type;
jed_simgrid_container_t root_container;
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
void jedule_sd_init() {
- XBT_LOG_CONNECT(jed_sd, jedule);
-
jedule_init_output();
}