X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc01c6a871dbbfd0cc84e26eb9f94aeb539e613e..3d845df082d79ab89649c1a8829eea201ae01085:/examples/simdag/sd_test.c

diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c
index 886f80b5e8..caeee55188 100644
--- a/examples/simdag/sd_test.c
+++ b/examples/simdag/sd_test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
 
@@ -43,8 +43,8 @@ int main(int argc, char **argv)
   /*  xbt_log_control_set("sd.thres=debug"); */
 
   if (argc < 2) {
-    INFO1("Usage: %s platform_file", argv[0]);
-    INFO1("example: %s sd_platform.xml", argv[0]);
+    XBT_INFO("Usage: %s platform_file", argv[0]);
+    XBT_INFO("example: %s sd_platform.xml", argv[0]);
     exit(1);
   }
 
@@ -63,29 +63,29 @@ int main(int argc, char **argv)
   computation_amount2 = 1000000;
   communication_amount12 = 2000000;
   communication_amount21 = 3000000;
-  INFO3("Computation time for %f flops on %s: %f", computation_amount1,
+  XBT_INFO("Computation time for %f flops on %s: %f", computation_amount1,
         name1, SD_workstation_get_computation_time(w1,
                                                    computation_amount1));
-  INFO3("Computation time for %f flops on %s: %f", computation_amount2,
+  XBT_INFO("Computation time for %f flops on %s: %f", computation_amount2,
         name2, SD_workstation_get_computation_time(w2,
                                                    computation_amount2));
 
-  INFO2("Route between %s and %s:", name1, name2);
+  XBT_INFO("Route between %s and %s:", name1, name2);
   route = SD_route_get_list(w1, w2);
   route_size = SD_route_get_size(w1, w2);
   for (i = 0; i < route_size; i++) {
-    INFO3("   Link %s: latency = %f, bandwidth = %f",
+    XBT_INFO("   Link %s: latency = %f, bandwidth = %f",
           SD_link_get_name(route[i]),
           SD_link_get_current_latency(route[i]),
           SD_link_get_current_bandwidth(route[i]));
   }
-  INFO2("Route latency = %f, route bandwidth = %f",
+  XBT_INFO("Route latency = %f, route bandwidth = %f",
         SD_route_get_current_latency(w1, w2),
         SD_route_get_current_bandwidth(w1, w2));
-  INFO4("Communication time for %f bytes between %s and %s: %f",
+  XBT_INFO("Communication time for %f bytes between %s and %s: %f",
         communication_amount12, name1, name2,
         SD_route_get_communication_time(w1, w2, communication_amount12));
-  INFO4("Communication time for %f bytes between %s and %s: %f",
+  XBT_INFO("Communication time for %f bytes between %s and %s: %f",
         communication_amount21, name2, name1,
         SD_route_get_communication_time(w2, w1, communication_amount21));
 
@@ -95,6 +95,10 @@ int main(int argc, char **argv)
   taskC = SD_task_create("Task C", NULL, 30.0);
   taskD = SD_task_create("Task D", NULL, 60.0);
 
+  /* try to attach and retrieve user data to a task */
+  SD_task_set_data(taskA, (void*) &computation_amount1);
+  if (computation_amount1 != (*((double*) SD_task_get_data(taskA))))
+      XBT_ERROR("User data was corrupted by a simple set/get");
 
   SD_task_dependency_add(NULL, NULL, taskB, taskA);
   SD_task_dependency_add(NULL, NULL, taskC, taskA);
@@ -164,7 +168,7 @@ int main(int argc, char **argv)
 
   /* estimated time */
   task = taskD;
-  INFO2("Estimated time for '%s': %f", SD_task_get_name(task),
+  XBT_INFO("Estimated time for '%s': %f", SD_task_get_name(task),
         SD_task_get_execution_time(task, workstation_number,
                                    workstation_list, computation_amount,
                                    communication_amount));
@@ -182,7 +186,7 @@ int main(int argc, char **argv)
 
   changed_tasks = SD_simulate(-1.0);
   xbt_dynar_foreach(changed_tasks, ctr, task) {
-    INFO3("Task '%s' start time: %f, finish time: %f",
+    XBT_INFO("Task '%s' start time: %f, finish time: %f",
           SD_task_get_name(task),
           SD_task_get_start_time(task), SD_task_get_finish_time(task));
   }
@@ -190,19 +194,19 @@ int main(int argc, char **argv)
   xbt_dynar_get_cpy(changed_tasks, 0, &checkD);
   xbt_dynar_get_cpy(changed_tasks, 1, &checkB);
 
-  xbt_assert0(checkD == taskD &&
+  xbt_assert(checkD == taskD &&
               checkB == taskB, "Unexpected simulation results");
 
   xbt_dynar_free_container(&changed_tasks);
 
-  DEBUG0("Destroying tasks...");
+  XBT_DEBUG("Destroying tasks...");
 
   SD_task_destroy(taskA);
   SD_task_destroy(taskB);
   SD_task_destroy(taskC);
   SD_task_destroy(taskD);
 
-  DEBUG0("Tasks destroyed. Exiting SimDag...");
+  XBT_DEBUG("Tasks destroyed. Exiting SimDag...");
 
   SD_exit();
   return 0;