X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb5b6b0c3c4d9a38bb205b2c8bc9aeeba8674a25..576fac0b2f9ff651dfc7454bba89bbf0f76e934d:/teshsuite/simdag/basic/basic0.c

diff --git a/teshsuite/simdag/basic/basic0.c b/teshsuite/simdag/basic/basic0.c
index 2961efdd87..4b472c3fd3 100644
--- a/teshsuite/simdag/basic/basic0.c
+++ b/teshsuite/simdag/basic/basic0.c
@@ -1,12 +1,10 @@
-/* Copyright (c) 2007-2012, 2014. The SimGrid Team.
+/* Copyright (c) 2007-2012, 2014-2015. 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 "simgrid/simdag.h"
 #include "xbt/log.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic0, sd, "SimDag test basic0");
@@ -16,22 +14,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic0, sd, "SimDag test basic0");
  *   - Create a no-op Init task
  *   - Create two communication tasks: 100MB and 1B
  *   - Schedule them concurrently on the two hosts of the platform
- * The two communications occur simultaneously but one is so short that it has
- * no impact on the other.
+ * The two communications occur simultaneously but one is so short that it has no impact on the other.
  * Simulated time should be:
  *          1e8/1.25e8 + 1e-4 = 0.8001 seconds
- * This corresponds to paying latency once and having the full bandwidth for the
- * big message.
+ * This corresponds to paying latency once and having the full bandwidth for the big message.
  */
 int main(int argc, char **argv)
 {
-  SD_task_t taskInit;
-  SD_task_t taskA;
-  SD_task_t taskB;
-  xbt_dynar_t ret;
-
   /* scheduling parameters */
-
   double communication_amount1[] = { 0, 1e8, 0, 0 };
   double communication_amount2[] = { 0, 1, 0, 0 };
   const double no_cost[] = { 0.0, 0.0 };
@@ -43,24 +33,19 @@ int main(int argc, char **argv)
   SD_create_environment(argv[1]);
 
   /* creation of the tasks and their dependencies */
-  taskInit = SD_task_create("Init", NULL, 1.0);
-  taskA = SD_task_create("Task Comm 1", NULL, 1.0);
-  taskB = SD_task_create("Task Comm 2", 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(taskA, 2, SD_workstation_get_list(), no_cost,
-                   communication_amount1, -1.0);
-  SD_task_schedule(taskB, 2, SD_workstation_get_list(), no_cost,
-                   communication_amount2, -1.0);
+  SD_task_t taskInit = SD_task_create("Init", NULL, 1.0);
+  SD_task_t taskA = SD_task_create("Task Comm 1", NULL, 1.0);
+  SD_task_t taskB = SD_task_create("Task Comm 2", NULL, 1.0);
 
   SD_task_dependency_add(NULL, NULL, taskInit, taskA);
   SD_task_dependency_add(NULL, NULL, taskInit, taskB);
 
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_task_schedule(taskInit, 1, sg_host_list(), no_cost, no_cost, -1.0);
+  SD_task_schedule(taskA, 2, sg_host_list(), no_cost, communication_amount1, -1.0);
+  SD_task_schedule(taskB, 2, sg_host_list(), no_cost, communication_amount2, -1.0);
+
+  /* let's launch the simulation! */
+  SD_simulate(-1.0);
   SD_task_destroy(taskInit);
   SD_task_destroy(taskA);
   SD_task_destroy(taskB);