X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/660f9807d0a906180dc31227b4c1ed744b2b2478..272ccad1b68b6d9c17069f3c934886925bb15b5d:/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 a1b4e56042..dd3f43356a 100644
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -6,37 +6,137 @@
  */
 
 
+#include <stdio.h>
+
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
-void jedule_log_sd_event(SD_task_t task) {
-	xbt_dynar_t host_list;
-	jed_event_t event;
-	int i;
+#include "surf/surf_private.h"
+#include "surf/surf_resource.h"
+#include "surf/surf.h"
+
+#include "instr/jedule/jedule_sd_binding.h"
+#include "instr/jedule/jedule_events.h"
+#include "instr/jedule/jedule_platform.h"
+#include "instr/jedule/jedule_output.h"
+
+#ifdef HAVE_JEDULE
 
-	xbt_assert(task != NULL);
+XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule,
+                                "Logging specific to Jedule SD binding");
+
+jedule_t jedule;
+
+void jedule_log_sd_event(SD_task_t task) {
+  xbt_dynar_t host_list;
+  jed_event_t event;
+  int i;
 
-	host_list = xbt_dynar_new(sizeof(char*), NULL);
+  xbt_assert(task != NULL);
 
-	for(i=0; i<task->workstation_nb; i++) {
-		char *hostname = surf_resource_name(task->workstation_list[i]->surf_workstation);
-		xbt_dynar_push(host_list, &hostname);
-	}
+  host_list = xbt_dynar_new(sizeof(char*), NULL);
 
-	create_jed_event(&event, SD_task_get_name(task), task->start_time,
-			task->finish_time, "SD");
+  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);
+  }
 
-	jed_event_add_resources(event, host_list);
+  create_jed_event(&event,
+      (char*)SD_task_get_name(task),
+      task->start_time,
+      task->finish_time,
+      "SD");
 
-	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;
+  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;
+
+  jed_simgrid_container_t root_container;
+
+
+  jed_create_jedule(&jedule);
 
+  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);
+
+  jed_simgrid_create_container(&root_container, root_comp->name);
+  jedule->root_container = root_container;
+
+  create_hierarchy(root_comp, root_container);
 
 }
+
+
+void jedule_sd_cleanup() {
+
+  jedule_cleanup_output();
+}
+
+void jedule_sd_init() {
+
+  jedule_init_output();
+}
+
+void jedule_sd_dump() {
+  FILE *fh;
+    char fname[1024];
+
+    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);
+
+  fclose(fh);
+
+}
+
+#endif