X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39a3f24e6220d4b50b9bdf0aef8a5af39117df57..04c44fbe77163cca75366d10e35ba400b804eaef:/examples/simdag/dax/dax_test.c

diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c
index 40976892fa..464531d719 100644
--- a/examples/simdag/dax/dax_test.c
+++ b/examples/simdag/dax/dax_test.c
@@ -1,6 +1,7 @@
 /* simple test trying to load a DAX file.                                   */
 
-/* Copyright (c) 2009 Da SimGrid Team. All rights reserved.                 */
+/* Copyright (c) 2009, 2010. 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. */
@@ -15,9 +16,17 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,
                              "Logging specific to this SimDag example");
 
+static int name_compare_hosts(const void *n1, const void *n2)
+{
+  char name1[80], name2[80];
+  strcpy(name1, SD_workstation_get_name(*((SD_workstation_t *) n1)));
+  strcpy(name2, SD_workstation_get_name(*((SD_workstation_t *) n2)));
+
+  return strcmp(name1, name2);
+}
 
 int main(int argc, char **argv) {
-  xbt_dynar_t dax;
+  xbt_dynar_t dax, changed;
   unsigned int cursor;
   SD_task_t task;
 
@@ -26,10 +35,18 @@ int main(int argc, char **argv) {
 
   /* Check our arguments */
   if (argc < 3) {
-    INFO1("Usage: %s platform_file dax_file", argv[0]);
-    INFO1("example: %s ../sd_platform.xml Montage_50.xml", argv[0]);
+    INFO1("Usage: %s platform_file dax_file [trace_file]", argv[0]);
+    INFO1("example: %s ../sd_platform.xml Montage_50.xml Montage_50.mytrace", argv[0]);
     exit(1);
   }
+  char *tracefilename;
+  if (argc == 3) {
+    char *last=strrchr(argv[2],'.');
+
+    tracefilename=bprintf("%.*s.trace",(int)(last==NULL?strlen(argv[2]):last-argv[2]),argv[2]);
+  } else {
+    tracefilename = xbt_strdup(argv[3]);
+  }
 
   /* creation of the environment */
   SD_create_environment(argv[1]);
@@ -54,6 +71,10 @@ int main(int argc, char **argv) {
   /* Schedule them all on the first workstation */
   INFO0("------------------- Schedule tasks ---------------------------");
   const SD_workstation_t *ws_list =  SD_workstation_get_list();
+  int totalHosts = SD_workstation_get_number();
+  qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t),
+        name_compare_hosts);
+
   int count = SD_workstation_get_number();
   xbt_dynar_foreach(dax,cursor,task) {
     if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) {
@@ -65,15 +86,13 @@ int main(int argc, char **argv) {
   }
 
   INFO0("------------------- Run the schedule ---------------------------");
-  SD_simulate(-1);
+  changed = SD_simulate(-1);
+  xbt_dynar_free_container(&changed);
   INFO0("------------------- Produce the trace file---------------------------");
-  char *last=strrchr(argv[2],'.');
-
-  char *filename=bprintf("%.*s.trace",last==NULL?strlen(argv[2]):last-argv[2],argv[2]);
-  INFO1("Producing the trace of the run into %s",filename);
-  FILE*out = fopen(filename,"w");
-  xbt_assert1(out,"Cannot write to %s",filename);
-  free(filename);
+  INFO1("Producing the trace of the run into %s",tracefilename);
+  FILE*out = fopen(tracefilename,"w");
+  xbt_assert1(out,"Cannot write to %s",tracefilename);
+  free(tracefilename);
 
   xbt_dynar_foreach(dax,cursor,task) {
     int kind = SD_task_get_kind(task);
@@ -88,17 +107,18 @@ int main(int argc, char **argv) {
       fprintf(out,"[%f] %s send %s %f # %s\n",SD_task_get_start_time(task),
           SD_workstation_get_name(wsl[0]),SD_workstation_get_name(wsl[1]),
           SD_task_get_amount(task), SD_task_get_name(task));
-      fprintf(out,"[%f] %s recv %s %f # %s\n",SD_task_get_start_time(task),
+      fprintf(out,"[%f] %s recv %s %f # %s\n",SD_task_get_finish_time(task),
           SD_workstation_get_name(wsl[1]),SD_workstation_get_name(wsl[0]),
           SD_task_get_amount(task), SD_task_get_name(task));
       break;
     default:
       xbt_die(bprintf("Task %s is of unknown kind %d",SD_task_get_name(task),SD_task_get_kind(task)));
     }
+    SD_task_destroy(task);
   }
   fclose(out);
 
   /* exit */
   SD_exit();
-  return 1;
+  return 0;
 }