New XBT module: file

[simgrid.git] / examples / simdag / dot / dot_test2.c

diff --git a/examples/simdag/dot/dot_test2.c b/examples/simdag/dot/dot_test2.c
index b4f4fbd..47f327a 100644 (file)
--- a/examples/simdag/dot/dot_test2.c
+++ b/examples/simdag/dot/dot_test2.c
@@ -1,6 +1,6 @@
 /* simple test trying to load a DOT file.                                   */
 
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010-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>
@@ -22,12 +22,12 @@ int main(int argc, char **argv)
   unsigned int cursor;
   SD_task_t task, *dot_as_array=NULL;
 
-  /* initialisation of SD */
+  /* SD initialization */
   SD_init(&argc, argv);
 
   /* Check our arguments */
   if (argc < 2) {
-    INFO1("Usage: %s dot_file", argv[0]);
+    XBT_INFO("Usage: %s dot_file", argv[0]);
     exit(1);
   }
 
@@ -35,23 +35,24 @@ int main(int argc, char **argv)
   dot = SD_dotload(argv[1]);
 
   /* Display all the tasks */
-  INFO0
+  XBT_INFO
       ("------------------- Display all tasks of the loaded DAG ---------------------------");
   xbt_dynar_foreach(dot, cursor, task) {
       SD_task_dump(task);
     }
 
-  INFO0
+  XBT_INFO
       ("--------------------- Transform the dynar into an array ---------------------------");
   cursor=0;
   dot_as_array = (SD_task_t*) xbt_dynar_to_array(dot);
-  INFO0
+  XBT_INFO
       ("----------------------------- dump tasks again ------------------------------------");
   while ((task=dot_as_array[cursor++])){
     SD_task_dump(task);
   }
 
-  xbt_dynar_foreach(dot, cursor, task) {
+  cursor=0;
+  while ((task=dot_as_array[cursor++])){
     SD_task_destroy(task);
   }