Merge pull request #2 from mquinson/master

[simgrid.git] / teshsuite / simdag / basic / basic1.c

diff --git a/teshsuite/simdag/basic/basic1.c b/teshsuite/simdag/basic/basic1.c
index 3b965ea..1d0b508 100644 (file)
--- a/teshsuite/simdag/basic/basic1.c
+++ b/teshsuite/simdag/basic/basic1.c
@@ -4,8 +4,6 @@
 /* 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 "simgrid/simdag.h"
 #include "xbt/log.h"
 
@@ -23,17 +21,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic1, sd, "SimDag test basic1");
  */
 int main(int argc, char **argv)
 {
-
-  SD_task_t taskInit;
-  SD_task_t taskA;
-  SD_task_t taskB;
-
+  /* scheduling parameters */
   double communication_amount1 = 1e9;
   double communication_amount2 = 1e9;
   double no_cost = 0.0;
 
-  const SD_workstation_t *workstation;
-
   /* initialization of SD */
   SD_init(&argc, argv);
 
@@ -41,27 +33,20 @@ 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 A", NULL, 1.0);
-  taskB = SD_task_create("Task Comm B", NULL, 1.0);
-
+  SD_task_t taskInit = SD_task_create("Init", NULL, 1.0);
+  SD_task_t taskA = SD_task_create("Task Comm A", NULL, 1.0);
+  SD_task_t taskB = SD_task_create("Task Comm B", NULL, 1.0);
 
-  /* scheduling parameters */
+  SD_task_dependency_add(NULL, NULL, taskInit, taskA);
+  SD_task_dependency_add(NULL, NULL, taskInit, taskB);
 
+  const sg_host_t *hosts = sg_host_list();
 
-  workstation = SD_workstation_get_list();
+  SD_task_schedule(taskInit, 1, sg_host_list(), &no_cost, &no_cost, -1.0);
+  SD_task_schedule(taskA, 1, &hosts[0], &no_cost, &communication_amount1, -1.0);
+  SD_task_schedule(taskB, 1, &hosts[1], &no_cost, &communication_amount2, -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, 1, &workstation[0], &no_cost,
-                   &communication_amount1, -1.0);
-  SD_task_schedule(taskB, 1, &workstation[1], &no_cost,
-                   &communication_amount2, -1.0);
-
-  SD_task_dependency_add(NULL, NULL, taskInit, taskA);
-  SD_task_dependency_add(NULL, NULL, taskInit, taskB);
-
   SD_simulate(-1.0);
   SD_task_destroy(taskA);
   SD_task_destroy(taskB);