X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc3c3416c4cca30fef7c29422d45094687f59893..61e948b810774df0ab0a52dd60ca1fb16af658c5:/examples/simdag/dot/simulate_dot.c

diff --git a/examples/simdag/dot/simulate_dot.c b/examples/simdag/dot/simulate_dot.c
index 3643f2b200..c0fbe0ccf3 100644
--- a/examples/simdag/dot/simulate_dot.c
+++ b/examples/simdag/dot/simulate_dot.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>
@@ -19,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test,
 
 int main(int argc, char **argv)
 {
-  xbt_dynar_t dot, changed;
+  xbt_dynar_t dot;
   unsigned int cursor;
   SD_task_t task;
 
@@ -32,6 +32,18 @@ int main(int argc, char **argv)
     XBT_INFO("example: %s ../2clusters.xml dag.dot dag.mytrace", argv[0]);
     exit(1);
   }
+
+  /* creation of the environment */
+  SD_create_environment(argv[1]);
+
+  /* load the DOT file  and schedule tasks */
+  dot = SD_dotload_with_sched(argv[2]);
+  if(!dot){
+    XBT_CRITICAL("The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose");
+    SD_exit();
+    exit(2);
+  }
+
   char *tracefilename;
   if (argc == 3) {
     char *last = strrchr(argv[2], '.');
@@ -44,16 +56,6 @@ int main(int argc, char **argv)
     tracefilename = xbt_strdup(argv[3]);
   }
 
-  /* creation of the environment */
-  SD_create_environment(argv[1]);
-
-  /* load the DOT file  and schedule tasks */
-  dot = SD_dotload_with_sched(argv[2]);
-  if(!dot){
-    SD_exit();
-    xbt_die("The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose");
-  }
-
   /* Display all the tasks */
   XBT_INFO
   ("------------------- Display all tasks of the loaded DAG ---------------------------");
@@ -71,8 +73,8 @@ int main(int argc, char **argv)
 
   XBT_INFO
   ("------------------- Run the schedule ---------------------------");
-  changed = SD_simulate(-1);
-  xbt_dynar_free_container(&changed);
+  SD_simulate(-1);
+
   XBT_INFO
   ("------------------- Produce the trace file---------------------------");
   XBT_INFO("Producing the trace of the run into %s", basename(tracefilename));
@@ -82,21 +84,21 @@ int main(int argc, char **argv)
 
   xbt_dynar_foreach(dot, cursor, task) {
     int kind = SD_task_get_kind(task);
-    SD_workstation_t *wsl = SD_task_get_workstation_list(task);
+    sg_host_t *wsl = SD_task_get_workstation_list(task);
     switch (kind) {
     case SD_TASK_COMP_SEQ:
       fprintf(out, "[%f->%f] %s compute %f flops # %s\n",
           SD_task_get_start_time(task),
           SD_task_get_finish_time(task),
-          SD_workstation_get_name(wsl[0]), SD_task_get_amount(task),
+          sg_host_get_name(wsl[0]), SD_task_get_amount(task),
           SD_task_get_name(task));
       break;
     case SD_TASK_COMM_E2E:
       fprintf(out, "[%f -> %f] %s -> %s transfer of %.0f bytes # %s\n",
           SD_task_get_start_time(task),
           SD_task_get_finish_time(task),
-          SD_workstation_get_name(wsl[0]),
-          SD_workstation_get_name(wsl[1]), SD_task_get_amount(task),
+          sg_host_get_name(wsl[0]),
+          sg_host_get_name(wsl[1]), SD_task_get_amount(task),
           SD_task_get_name(task));
       break;
     default:
@@ -106,6 +108,7 @@ int main(int argc, char **argv)
     SD_task_destroy(task);
   }
   fclose(out);
+  xbt_dynar_free_container(&dot);
 
   /* exit */
   SD_exit();