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

diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c
index 8ae9424c22..934d812824 100644
--- a/examples/simdag/dax/dax_test.c
+++ b/examples/simdag/dax/dax_test.c
@@ -1,6 +1,6 @@
 /* simple test trying to load a DAX file.                                   */
 
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "xbt/log.h"
 #include "xbt/ex.h"
 #include <string.h>
@@ -27,41 +27,39 @@ static int name_compare_hosts(const void *n1, const void *n2)
 
 int main(int argc, char **argv)
 {
-  xbt_dynar_t dax, changed;
+  xbt_dynar_t dax;
   unsigned int cursor;
   SD_task_t task;
 
-  /* initialisation of SD */
+  /* SD initialization */
   SD_init(&argc, argv);
 
   /* Check our arguments */
-  if (argc < 3) {
-    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 {
+  xbt_assert(argc > 2, "Usage: %s platform_file dax_file [jedule_file]\n"
+	     "\tExample: %s simulacrum_7_hosts.xml Montage_25.xml Montage_25.jed", 
+	     argv[0], argv[0]);
+
+  char *last = strrchr(argv[2], '.');
+  char * tracefilename = bprintf("%.*s.trace",(int) (last == NULL ? 
+						   strlen(argv[2]) : 
+						   last - argv[2]), argv[2]);  
+  if (argc == 4)
     tracefilename = xbt_strdup(argv[3]);
-  }
-
+ 
   /* creation of the environment */
   SD_create_environment(argv[1]);
 
   /* load the DAX file */
   dax = SD_daxload(argv[2]);
+  if (!dax){
+    XBT_ERROR("A problem occurred during DAX parsing (cycle or syntax). Do not continue this test");
+    free(tracefilename);
+    SD_exit();
+    exit(255);
+  }
 
   /* Display all the tasks */
-  INFO0
+  XBT_INFO
       ("------------------- Display all tasks of the loaded DAG ---------------------------");
   xbt_dynar_foreach(dax, cursor, task) {
     SD_task_dump(task);
@@ -76,13 +74,13 @@ int main(int argc, char **argv)
   fclose(dotout);
 
   /* Schedule them all on the first workstation */
-  INFO0("------------------- Schedule tasks ---------------------------");
+  XBT_INFO("------------------- Schedule tasks ---------------------------");
   const SD_workstation_t *ws_list = SD_workstation_get_list();
-  int totalHosts = SD_workstation_get_number();
+  int totalHosts = SD_workstation_get_count();
   qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t),
         name_compare_hosts);
 
-  int count = SD_workstation_get_number();
+  int count = SD_workstation_get_count();
   xbt_dynar_foreach(dax, cursor, task) {
     if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) {
       if (!strcmp(SD_task_get_name(task), "end"))
@@ -92,15 +90,14 @@ int main(int argc, char **argv)
     }
   }
 
-  INFO0
+  XBT_INFO
       ("------------------- Run the schedule ---------------------------");
-  changed = SD_simulate(-1);
-  xbt_dynar_free_container(&changed);
-  INFO0
+  SD_simulate(-1);
+  XBT_INFO
       ("------------------- Produce the trace file---------------------------");
-  INFO1("Producing the trace of the run into %s", tracefilename);
+  XBT_INFO("Producing the trace of the run into %s", tracefilename);
   FILE *out = fopen(tracefilename, "w");
-  xbt_assert1(out, "Cannot write to %s", tracefilename);
+  xbt_assert(out, "Cannot write to %s", tracefilename);
   free(tracefilename);
 
   xbt_dynar_foreach(dax, cursor, task) {
@@ -126,14 +123,13 @@ int main(int argc, char **argv)
               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)));
+      xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task),
+              SD_task_get_kind(task));
     }
     SD_task_destroy(task);
   }
   fclose(out);
-
+  xbt_dynar_free_container(&dax);
   /* exit */
   SD_exit();
   return 0;