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

diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c
index 05c9b58f7d..04b2a7d468 100644
--- a/examples/simdag/dax/dax_test.c
+++ b/examples/simdag/dax/dax_test.c
@@ -10,10 +10,19 @@
 #include "simdag/simdag.h"
 #include "xbt/log.h"
 #include "xbt/ex.h"
+#include <string.h>
 
 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;
@@ -25,10 +34,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",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]);
@@ -42,47 +59,65 @@ int main(int argc, char **argv) {
     SD_task_dump(task);
   }
 
-  FILE *out = fopen("dax.dot","w");
-  fprintf(out,"digraph A {\n");
+  FILE *dotout = fopen("dax.dot","w");
+  fprintf(dotout,"digraph A {\n");
   xbt_dynar_foreach(dax,cursor,task) {
-    SD_task_dotty(task,out);
+    SD_task_dotty(task,dotout);
   }
-  fprintf(out,"}\n");
-  fclose(out);
+  fprintf(dotout,"}\n");
+  fclose(dotout);
 
   /* 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)
-      SD_task_schedulel(task,1,ws_list[0]);
+    if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) {
+      if (!strcmp(SD_task_get_name(task),"end"))
+        SD_task_schedulel(task,1,ws_list[0]);
+      else
+        SD_task_schedulel(task,1,ws_list[cursor%count]);
+    }
   }
 
   INFO0("------------------- Run the schedule ---------------------------");
-  SD_simulate(-1);
+  SD_task_t *changed = SD_simulate(-1);
+  free(changed);
   INFO0("------------------- Produce the trace file---------------------------");
+  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);
     SD_workstation_t *wsl = SD_task_get_workstation_list(task);
     switch (kind) {
     case SD_TASK_COMP_SEQ:
-      INFO4("[%f] %s compute %f # %s",SD_task_get_start_time(task),
+      fprintf(out,"[%f] %s compute %f # %s\n",SD_task_get_start_time(task),
           SD_workstation_get_name(wsl[0]),SD_task_get_amount(task),
           SD_task_get_name(task));
       break;
     case SD_TASK_COMM_E2E:
-      INFO5("[%f] %s send %s %f # %s",SD_task_get_start_time(task),
+      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));
-      INFO5("[%f] %s recv %s %f # %s",SD_task_get_start_time(task),
+      fprintf(out,"[%f] %s recv %s %f # %s\n",SD_task_get_start_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;
 }