X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4895c3c3d812abc5ae8cce1d75580f7ed4bbf4f..a4fc28ec2b9c97fc5bff04e0e5f420703f5ab419:/teshsuite/simdag/basic/basic5.c

diff --git a/teshsuite/simdag/basic/basic5.c b/teshsuite/simdag/basic/basic5.c
index 9dfa416dd4..59e0bf6a78 100644
--- a/teshsuite/simdag/basic/basic5.c
+++ b/teshsuite/simdag/basic/basic5.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(basic5, sd, "SimDag test basic5");
@@ -22,15 +20,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic5, sd, "SimDag test basic5");
  */
 int main(int argc, char **argv)
 {
-
-  /* creation of the tasks and their dependencies */
-  SD_task_t taskInit;
-  SD_task_t taskA;
-  SD_task_t taskB;
-  xbt_dynar_t ret;
-
   /* scheduling parameters */
-
   double no_cost[] = { 0., 0., 0., 0. };
   double amount[] = { 0., 100000., 0., 0. };
   double comput[] = { 10000000. };
@@ -42,23 +32,19 @@ int main(int argc, char **argv)
   SD_create_environment(argv[1]);
 
   /* creation of the tasks and their dependencies */
-  taskInit = SD_task_create("Task Init", NULL, 1.0);
-  taskA = SD_task_create("Task A", NULL, 1.0);
-  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(taskA, 2, SD_workstation_get_list(), no_cost, amount,
-                   -1.0);
-  SD_task_schedule(taskB, 1, SD_workstation_get_list(), comput, no_cost,
-                   -1.0);
+  SD_task_t taskInit = SD_task_create("Task Init", NULL, 1.0);
+  SD_task_t taskA = SD_task_create("Task A", NULL, 1.0);
+  SD_task_t taskB = SD_task_create("Task B", 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, amount, -1.0);
+  SD_task_schedule(taskB, 1, sg_host_list(), comput, no_cost, -1.0);
+
+  /* let's launch the simulation! */
+  SD_simulate(-1.0);
   SD_task_destroy(taskInit);
   SD_task_destroy(taskA);
   SD_task_destroy(taskB);