X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..08513f6dfcb4203b1320f4a0f4352382c7e0995e:/teshsuite/simdag/basic2.c

diff --git a/teshsuite/simdag/basic2.c b/teshsuite/simdag/basic2.c
index 9a76191276..6e4ac837f4 100644
--- a/teshsuite/simdag/basic2.c
+++ b/teshsuite/simdag/basic2.c
@@ -1,21 +1,41 @@
+/* Copyright (c) 2007-2012. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
+#include "xbt/log.h"
 
+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;
 
-  /* initialisation of SD */
+  /* initialization of SD */
   SD_init(&argc, argv);
 
   /* creation of the environment */
@@ -32,8 +52,8 @@ int main(int argc, char **argv)
   workstation = SD_workstation_get_list();
 
   /* 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, 1, &workstation[0], &no_cost,
                    &communication_amount1, -1.0);
   SD_task_schedule(taskB, 1, &workstation[1], &no_cost,
@@ -42,7 +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);
+
+  XBT_INFO("Simulation time: %f", SD_get_clock());
 
   SD_exit();
   return 0;