X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..5faf49cdf3f8ad8751317b857a6d3134fe07eda3:/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 67a1e91ac4..b46cc9d686 100644
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -6,8 +6,6 @@
  */
 
 
-#include <stdio.h>
-
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
@@ -20,6 +18,8 @@
 #include "instr/jedule/jedule_platform.h"
 #include "instr/jedule/jedule_output.h"
 
+#include <stdio.h>
+
 #ifdef HAVE_JEDULE
 
 XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");
@@ -29,110 +29,117 @@ 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 = sg_host_name(task->workstation_list[i]);
+    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;
-	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_dict_foreach(current_comp->to_index, cursor, key, network_elem) {
-			char *hostname;
-			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);
-		}
-
-		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) {
+      xbt_dynar_push_as(hosts, char*, network_elem->name);
+    }
+
+    jed_simgrid_add_resources(current_container, hosts);
+    xbt_dynar_free(&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() {
 
-	XBT_LOG_CONNECT(jed_sd, jedule);
+  jedule_init_output();
+}
 
-	jedule_init_output();
+void jedule_sd_exit(void)
+{
+  jed_free_jedule(jedule);
+  jedule = NULL;
 }
 
 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);
 
 }