X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc01c6a871dbbfd0cc84e26eb9f94aeb539e613e..4850a21a0c6e5a9aabe9d9a5e366108381b7a8a7:/teshsuite/simdag/basic2.c

diff --git a/teshsuite/simdag/basic2.c b/teshsuite/simdag/basic2.c
index 0f9f6fc87e..6e4ac837f4 100644
--- a/teshsuite/simdag/basic2.c
+++ b/teshsuite/simdag/basic2.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,17 +11,28 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic2, sd, "SimDag test basic2");
 
+/* Basic SimDag Test 2
+ * Scenario:
+ *   - Create a no-op Init task
+ *   - Create two communication tasks: 1GB and 100MB
+ *   - Schedule them concurrently on the two hosts of the platform
+ * The two communications occur simultaneously. They share the network for the
+ * duration of the shortest one, then the longest one has the full bandwidth.
+ * Simulated time should be:
+ *          1e8/(1/2*1.25e8) + 9e8/1.25e8) + 1e-4 = 8.8001 seconds
+ */
 int main(int argc, char **argv)
 {
 
   SD_task_t taskInit;
   SD_task_t taskA;
   SD_task_t taskB;
+  xbt_dynar_t ret;
 
   const SD_workstation_t *workstation;
 
-  double communication_amount1 = 1000000000;
-  double communication_amount2 = 100000000;
+  double communication_amount1 = 1e9;
+  double communication_amount2 = 1e8;
   double no_cost = 0.0;
 
   /* initialization of SD */
@@ -51,9 +62,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(taskA);
+  SD_task_destroy(taskB);
+  SD_task_destroy(taskInit);
 
-  INFO1("Simulation time: %f", SD_get_clock());
+  XBT_INFO("Simulation time: %f", SD_get_clock());
 
   SD_exit();
   return 0;