X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb5b6b0c3c4d9a38bb205b2c8bc9aeeba8674a25..d42d0c6f54ae825a249799cb1e4e2920de5205c8:/teshsuite/simdag/basic/basic4.c diff --git a/teshsuite/simdag/basic/basic4.c b/teshsuite/simdag/basic/basic4.c index 0005e04d3a..a3ab2e3698 100644 --- a/teshsuite/simdag/basic/basic4.c +++ b/teshsuite/simdag/basic/basic4.c @@ -1,4 +1,4 @@ -/* 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 @@ -6,7 +6,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(basic4, sd, "SimDag test basic4"); @@ -25,14 +25,13 @@ int main(int argc, char **argv) SD_task_t taskInit; SD_task_t taskA; SD_task_t taskFin; - xbt_dynar_t ret; /* scheduling parameters */ double no_cost[] = { 0., 0., 0., 0. }; double amount[] = { 0., 1., 0., 0. }; - /* initialisation of SD */ + /* SD initialization */ SD_init(&argc, argv); /* creation of the environment */ @@ -45,18 +44,17 @@ int main(int argc, char **argv) /* let's launch the simulation! */ - SD_task_schedule(taskInit, 1, SD_workstation_get_list(), no_cost, + SD_task_schedule(taskInit, 1, sg_host_list(), no_cost, no_cost, -1.0); - SD_task_schedule(taskA, 2, SD_workstation_get_list(), no_cost, amount, + SD_task_schedule(taskA, 2, sg_host_list(), no_cost, amount, -1.0); - SD_task_schedule(taskFin, 1, SD_workstation_get_list(), no_cost, no_cost, + SD_task_schedule(taskFin, 1, sg_host_list(), no_cost, no_cost, -1.0); SD_task_dependency_add(NULL, NULL, taskInit, taskA); SD_task_dependency_add(NULL, NULL, taskA, taskFin); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_destroy(taskInit); SD_task_destroy(taskA); SD_task_destroy(taskFin);