Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
sed -i -e 's/\t/ /g' *.[ch] Please people, stop using tabs in your source
[simgrid.git] / src / instr / jedule / jedule_sd_binding.c
index e5c51c6..dd3f433 100644 (file)
@@ -29,108 +29,113 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule,
 jedule_t jedule;
 
 void jedule_log_sd_event(SD_task_t task) {
-       xbt_dynar_t host_list;
-       jed_event_t event;
-       int i;
+  xbt_dynar_t host_list;
+  jed_event_t event;
+  int i;
 
-       xbt_assert(task != NULL);
+  xbt_assert(task != NULL);
 
-       host_list = xbt_dynar_new(sizeof(char*), NULL);
+  host_list = xbt_dynar_new(sizeof(char*), NULL);
 
-       for(i=0; i<task->workstation_nb; i++) {
-               char *hostname = (char*)surf_resource_name(task->workstation_list[i]->surf_workstation);
-               xbt_dynar_push(host_list, &hostname);
-       }
+  for(i=0; i<task->workstation_nb; i++) {
+    char *hostname = (char*)surf_resource_name(task->workstation_list[i]->surf_workstation);
+    xbt_dynar_push(host_list, &hostname);
+  }
 
-       create_jed_event(&event,
-                       (char*)SD_task_get_name(task),
-                       task->start_time,
-                       task->finish_time,
-                       "SD");
+  create_jed_event(&event,
+      (char*)SD_task_get_name(task),
+      task->start_time,
+      task->finish_time,
+      "SD");
 
-       jed_event_add_resources(event, host_list);
-       jedule_store_event(event);
+  jed_event_add_resources(event, host_list);
+  jedule_store_event(event);
 
-       xbt_dynar_free(&host_list);
+  xbt_dynar_free(&host_list);
 }
 
 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;
-
-       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_dynar_foreach(current_comp->index_network_elm, 
-                                 dynar_cursor, network_elem) {
-                       char *hostname;
-                       hostname = strdup(network_elem->name);
-                       xbt_dynar_push(hosts, &hostname);
-               }
-
-               jed_simgrid_add_resources(current_container, hosts);
-
-       } else {
-               xbt_dict_foreach(current_comp->routing_sons, cursor, key, elem) {
-                       jed_simgrid_container_t child_container;
-                       jed_simgrid_create_container(&child_container, elem->name);
-                       jed_simgrid_add_container(current_container, child_container);
-                       XBT_DEBUG("name : %s\n", elem->name);
-                       create_hierarchy(elem, child_container);
-               }
-       }
+    jed_simgrid_container_t current_container) {
+  xbt_dict_cursor_t cursor = NULL;
+  unsigned int dynar_cursor;
+  char *key;
+  AS_t elem;
+  sg_routing_edge_t network_elem;
+
+  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_dynar_foreach(current_comp->index_network_elm, 
+          dynar_cursor, network_elem) {
+      char *hostname;
+      hostname = strdup(network_elem->name);
+      xbt_dynar_push(hosts, &hostname);
+    }
+
+    jed_simgrid_add_resources(current_container, hosts);
+
+  } else {
+    xbt_dict_foreach(current_comp->routing_sons, cursor, key, elem) {
+      jed_simgrid_container_t child_container;
+      jed_simgrid_create_container(&child_container, elem->name);
+      jed_simgrid_add_container(current_container, child_container);
+      XBT_DEBUG("name : %s\n", elem->name);
+      create_hierarchy(elem, child_container);
+    }
+  }
 }
 
 void jedule_setup_platform() {
 
-       AS_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;
+  jed_simgrid_container_t root_container;
 
 
-       jed_create_jedule(&jedule);
+  jed_create_jedule(&jedule);
 
-       root_comp = global_routing->root;
-       XBT_DEBUG("root name %s\n", root_comp->name);
+  root_comp = routing_platf->root;
+  XBT_DEBUG("root name %s\n", root_comp->name);
 
-       // that doesn't work
-       // type = root_comp->get_network_element_type(root_comp->name);
+  // that doesn't work
+  // type = root_comp->get_network_element_type(root_comp->name);
 
-       jed_simgrid_create_container(&root_container, root_comp->name);
-       jedule->root_container = root_container;
+  jed_simgrid_create_container(&root_container, root_comp->name);
+  jedule->root_container = root_container;
 
-       create_hierarchy(root_comp, root_container);
+  create_hierarchy(root_comp, root_container);
 
 }
 
 
 void jedule_sd_cleanup() {
 
-       jedule_cleanup_output();
+  jedule_cleanup_output();
 }
 
 void jedule_sd_init() {
 
-       jedule_init_output();
+  jedule_init_output();
 }
 
 void jedule_sd_dump() {
-       FILE *fh;
+  FILE *fh;
+    char fname[1024];
 
-       fh = fopen("simgrid.jed", "w");
+    fname[0] = '\0';
+    strcat(fname, xbt_binary_name);
+    strcat(fname, ".jed\0");
+    
+  fh = fopen(fname, "w");
 
-       write_jedule_output(fh, jedule, jedule_event_list, NULL);
+  write_jedule_output(fh, jedule, jedule_event_list, NULL);
 
-       fclose(fh);
+  fclose(fh);
 
 }