X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/892a26c1eb3583570fff6024b49b4915624236ae..d44e911ae45609418de22c72114e85c4e031fcf4:/teshsuite/simdag/basic5.c

diff --git a/teshsuite/simdag/basic5.c b/teshsuite/simdag/basic5.c
index 48a988b326..9dfa416dd4 100644
--- a/teshsuite/simdag/basic5.c
+++ b/teshsuite/simdag/basic5.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2012, 2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,6 +11,15 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic5, sd, "SimDag test basic5");
 
+/* Basic SimDag Test 5
+ * Scenario:
+ *   - Create a no-op Init task
+ *   - Create two tasks: send 100kB and compute 10Mflops
+ *   - Schedule them concurrently
+ * The two tasks should overlap smoothly as they use different resources.
+ * Simulated time should be:
+ *          MAX(1e5/(1.25e8), 1e7/4e9) = MAX(.0009, .0025) = 0.0025 seconds
+ */
 int main(int argc, char **argv)
 {
 
@@ -18,7 +27,7 @@ int main(int argc, char **argv)
   SD_task_t taskInit;
   SD_task_t taskA;
   SD_task_t taskB;
-
+  xbt_dynar_t ret;
 
   /* scheduling parameters */
 
@@ -38,8 +47,8 @@ int main(int argc, char **argv)
   taskB = SD_task_create("Task B", NULL, 1.0);
 
   /* let's launch the simulation! */
-  SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost, no_cost,
-                   -1.0);
+  SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost,
+                   no_cost, -1.0);
   SD_task_schedule(taskA, 2, SD_workstation_get_list(), no_cost, amount,
                    -1.0);
   SD_task_schedule(taskB, 1, SD_workstation_get_list(), comput, no_cost,
@@ -48,9 +57,13 @@ int main(int argc, char **argv)
   SD_task_dependency_add(NULL, NULL, taskInit, taskA);
   SD_task_dependency_add(NULL, NULL, taskInit, taskB);
 
-  SD_simulate(-1.0);
+  ret = SD_simulate(-1.0);
+  xbt_dynar_free(&ret);
+  SD_task_destroy(taskInit);
+  SD_task_destroy(taskA);
+  SD_task_destroy(taskB);
 
-  INFO1("Simulation time: %f", SD_get_clock());
+  XBT_INFO("Simulation time: %f", SD_get_clock());
 
   SD_exit();
   return 0;