X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/406f54970c00ca178fa918763d943027bd09e3ba..977f6f025a2bf30e3bee3122bd62351d308ec304:/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 a58226e736..9d31bdc235 100644
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -1,22 +1,22 @@
-/*
- * jedule_sd_binding.c
- *
- *  Created on: Dec 2, 2010
- *      Author: sascha
- */
+/* Copyright (c) 2010-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
 
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
-#include "surf/surf_private.h"
-#include "surf/surf_resource.h"
+#include "src/surf/surf_private.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"
+#include "simgrid/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_events.h"
+#include "simgrid/jedule/jedule_platform.h"
+#include "simgrid/jedule/jedule_output.h"
+
+#include "simgrid/simdag.h"
+#include "src/simdag/simdag_private.h"
 
 #include <stdio.h>
 
@@ -28,7 +28,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule,
 
 jedule_t jedule;
 
-void jedule_log_sd_event(SD_task_t task) {
+void jedule_log_sd_event(SD_task_t task)
+{
   xbt_dynar_t host_list;
   jed_event_t event;
   int i;
@@ -37,8 +38,8 @@ void jedule_log_sd_event(SD_task_t task) {
 
   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);
+  for(i=0; i<task->host_count; i++) {
+    const char *hostname = sg_host_get_name(task->host_list[i]);
     xbt_dynar_push(host_list, &hostname);
   }
 
@@ -55,88 +56,93 @@ void jedule_log_sd_event(SD_task_t task) {
 }
 
 static void create_hierarchy(AS_t current_comp,
-    jed_simgrid_container_t current_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;
+  xbt_dict_t routing_sons = surf_AS_get_routing_sons(current_comp);
 
-  if(xbt_dict_is_empty(current_comp->routing_sons)) {
+  if (xbt_dict_is_empty(routing_sons)) {
     // I am no AS
     // add hosts to jedule platform
+    xbt_dynar_t table = surf_AS_get_hosts(current_comp);
     xbt_dynar_t hosts;
+    unsigned int dynar_cursor;
+    sg_host_t host_elem;
 
     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);
+    xbt_dynar_foreach(table, dynar_cursor, host_elem) {
+      xbt_dynar_push_as(hosts, const char*, sg_host_get_name(host_elem));
     }
 
     jed_simgrid_add_resources(current_container, hosts);
-
+    xbt_dynar_free(&hosts);
+    xbt_dynar_free(&table);
   } else {
-    xbt_dict_foreach(current_comp->routing_sons, cursor, key, elem) {
+    xbt_dict_foreach(routing_sons, cursor, key, elem) {
       jed_simgrid_container_t child_container;
-      jed_simgrid_create_container(&child_container, elem->name);
+      jed_simgrid_create_container(&child_container, surf_AS_get_name(elem));
       jed_simgrid_add_container(current_container, child_container);
-      XBT_DEBUG("name : %s\n", elem->name);
+      XBT_DEBUG("name : %s\n", surf_AS_get_name(elem));
       create_hierarchy(elem, child_container);
     }
   }
 }
 
-void jedule_setup_platform() {
-
+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);
+  root_comp = surf_AS_get_routing_root();
+  XBT_DEBUG("root name %s\n", surf_AS_get_name(root_comp));
 
-  jed_simgrid_create_container(&root_container, root_comp->name);
+  jed_simgrid_create_container(&root_container, surf_AS_get_name(root_comp));
   jedule->root_container = root_container;
 
   create_hierarchy(root_comp, root_container);
-
 }
 
 
-void jedule_sd_cleanup() {
-
+void jedule_sd_cleanup()
+{
   jedule_cleanup_output();
 }
 
-void jedule_sd_init() {
-
+void jedule_sd_init()
+{
   jedule_init_output();
 }
 
-void jedule_sd_dump() {
-  FILE *fh;
+void jedule_sd_exit(void)
+{
+  if (jedule) {
+    jed_free_jedule(jedule);
+    jedule = NULL;
+  }
+}
+
+void jedule_sd_dump()
+{
+  if (jedule) {
+    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);
+    fh = fopen(fname, "w");
 
-  fclose(fh);
+    write_jedule_output(fh, jedule, jedule_event_list, NULL);
 
+    fclose(fh);
+  }
 }
 
 #endif