X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e81fd0093fecb13ce2c734ad7f18f15d586c4edc..d96c801afcc9beac00274914682f4ce28f54ed7f:/examples/simdag/dot/dot_test.c?ds=sidebyside

diff --git a/examples/simdag/dot/dot_test.c b/examples/simdag/dot/dot_test.c
index 3edb40d39e..58addb11a7 100644
--- a/examples/simdag/dot/dot_test.c
+++ b/examples/simdag/dot/dot_test.c
@@ -12,6 +12,7 @@
 #include "xbt/log.h"
 #include "xbt/ex.h"
 #include <string.h>
+#include <libgen.h>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,
                              "Logging specific to this SimDag example");
@@ -22,13 +23,13 @@ int main(int argc, char **argv)
   unsigned int cursor;
   SD_task_t task;
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* Check our arguments */
   if (argc < 3) {
-    INFO1("Usage: %s platform_file dot_file [trace_file]", argv[0]);
-    INFO1("example: %s ../2clusters.xml dag.dot dag.mytrace", argv[0]);
+    XBT_INFO("Usage: %s platform_file dot_file [trace_file]", argv[0]);
+    XBT_INFO("example: %s ../2clusters.xml dag.dot dag.mytrace", argv[0]);
     exit(1);
   }
   char *tracefilename;
@@ -49,12 +50,12 @@ int main(int argc, char **argv)
   /* load the DOT file */
   dot = SD_dotload(argv[2]);
   if(dot == NULL){
-    INFO0("No dot load may be you have a cycle in your graph");
-    return -1;
+    SD_exit();
+    xbt_die("No dot load may be you have a cycle in your graph");
   }
 
   /* Display all the tasks */
-  INFO0
+  XBT_INFO
       ("------------------- Display all tasks of the loaded DAG ---------------------------");
   xbt_dynar_foreach(dot, cursor, task) {
     SD_task_dump(task);
@@ -69,7 +70,7 @@ 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 count = SD_workstation_get_number();
@@ -82,15 +83,15 @@ int main(int argc, char **argv)
     }
   }
 
-  INFO0
+  XBT_INFO
       ("------------------- Run the schedule ---------------------------");
   changed = SD_simulate(-1);
   xbt_dynar_free_container(&changed);
-  INFO0
+  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", basename(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(dot, cursor, task) {
@@ -116,12 +117,12 @@ 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);
   }
+  xbt_dynar_free_container(&dot);
   fclose(out);
 
   /* exit */