change generated trace format

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

diff --git a/examples/simdag/dot/dot_test.c b/examples/simdag/dot/dot_test.c
index 856f417..05eb34f 100644 (file)
--- 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 "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");
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(test,
                              "Logging specific to this SimDag example");


@@ -22,7 +23,7 @@ int main(int argc, char **argv)
   unsigned int cursor;
   SD_task_t task;
 
   unsigned int cursor;
   SD_task_t task;
 

-  /* initialisation of SD */
+  /* initialization of SD */

   SD_init(&argc, argv);
 
   /* Check our arguments */
   SD_init(&argc, argv);
 
   /* Check our arguments */


@@ -49,8 +50,8 @@ int main(int argc, char **argv)
   /* load the DOT file */
   dot = SD_dotload(argv[2]);
   if(dot == NULL){
   /* load the DOT file */
   dot = SD_dotload(argv[2]);
   if(dot == NULL){

-    XBT_INFO("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 */
   }
 
   /* Display all the tasks */


@@ -88,9 +89,9 @@ int main(int argc, char **argv)
   xbt_dynar_free_container(&changed);
   XBT_INFO
       ("------------------- Produce the trace file---------------------------");
   xbt_dynar_free_container(&changed);
   XBT_INFO
       ("------------------- Produce the trace file---------------------------");

-  XBT_INFO("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");
   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) {
   free(tracefilename);
 
   xbt_dynar_foreach(dot, cursor, task) {


@@ -98,22 +99,19 @@ int main(int argc, char **argv)
     SD_workstation_t *wsl = SD_task_get_workstation_list(task);
     switch (kind) {
     case SD_TASK_COMP_SEQ:
     SD_workstation_t *wsl = SD_task_get_workstation_list(task);
     switch (kind) {
     case SD_TASK_COMP_SEQ:

-      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));
+      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),
+          SD_task_get_name(task));

       break;
     case SD_TASK_COMM_E2E:
       break;
     case SD_TASK_COMM_E2E:

-      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));
-      fprintf(out, "[%f] %s recv %s %f # %s\n",
-              SD_task_get_finish_time(task),
-              SD_workstation_get_name(wsl[1]),
-              SD_workstation_get_name(wsl[0]), SD_task_get_amount(task),
-              SD_task_get_name(task));
+      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),
+          SD_task_get_name(task));

       break;
     default:
       xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task),
       break;
     default:
       xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task),


@@ -121,6 +119,7 @@ int main(int argc, char **argv)
     }
     SD_task_destroy(task);
   }
     }
     SD_task_destroy(task);
   }

+  xbt_dynar_free_container(&dot);

   fclose(out);
 
   /* exit */
   fclose(out);
 
   /* exit */