produce a jedule file in the jedule format

[simgrid.git] / 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 bfd0258..d780d3c 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -7,16 +7,16 @@
 #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 "simdag/private.h"
+#include "simgrid/simdag.h"
+#include "src/simdag/simdag_private.h"
 
 #include <stdio.h>
 
@@ -38,16 +38,13 @@ 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 = sg_host_name(task->workstation_list[i]);
+  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);
   }
 
-  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);
@@ -74,7 +71,7 @@ static void create_hierarchy(AS_t current_comp,
     hosts = xbt_dynar_new(sizeof(char*), NULL);
 
     xbt_dynar_foreach(table, dynar_cursor, host_elem) {
-      xbt_dynar_push_as(hosts, char*, sg_host_name(host_elem));
+      xbt_dynar_push_as(hosts, const char*, sg_host_get_name(host_elem));
     }
 
     jed_simgrid_add_resources(current_container, hosts);
@@ -127,21 +124,23 @@ void jedule_sd_exit(void)
   }
 }
 
-void jedule_sd_dump()
+void jedule_sd_dump(const char * filename)
 {
   if (jedule) {
+    char *fname;
     FILE *fh;
-    char fname[1024];
-
-    fname[0] = '\0';
-    strcat(fname, xbt_binary_name);
-    strcat(fname, ".jed\0");
+    if (!filename) {
+      fname = bprintf("%s.jed", xbt_binary_name);
+    } else {
+      fname = xbt_strdup(filename);
+    }
 
     fh = fopen(fname, "w");
 
     write_jedule_output(fh, jedule, jedule_event_list, NULL);
 
     fclose(fh);
+    free(fname);
   }
 }