X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3e4aba8bde56e605110f8140ab13f92b62b3711..e9241a5304d674cb5455525bce4860408496c9c1:/teshsuite/simdag/network/p2p/test_latency2.c diff --git a/teshsuite/simdag/network/p2p/test_latency2.c b/teshsuite/simdag/network/p2p/test_latency2.c index d78935df44..5a22fa0ad7 100644 --- a/teshsuite/simdag/network/p2p/test_latency2.c +++ b/teshsuite/simdag/network/p2p/test_latency2.c @@ -1,6 +1,6 @@ /* Latency tests */ -/* Copyright (c) 2007, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007, 2009-2011, 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -9,7 +9,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" /* @@ -28,7 +28,6 @@ int main(int argc, char **argv) double communication_amount2[] = { 0.0, 1.0, 0.0, 0.0 }; double no_cost1[] = { 0.0 }; double no_cost[] = { 0.0, 0.0 }; - xbt_dynar_t ret; SD_init(&argc, argv); SD_create_environment(argv[1]); @@ -37,18 +36,17 @@ int main(int argc, char **argv) task1 = SD_task_create("Comm 1", NULL, 1.0); task2 = SD_task_create("Comm 2", NULL, 1.0); - SD_task_schedule(root, 1, SD_workstation_get_list(), no_cost1, no_cost1, + SD_task_schedule(root, 1, sg_host_list(), no_cost1, no_cost1, -1.0); - SD_task_schedule(task1, 2, SD_workstation_get_list(), no_cost, + SD_task_schedule(task1, 2, sg_host_list(), no_cost, communication_amount1, -1.0); - SD_task_schedule(task2, 2, SD_workstation_get_list(), no_cost, + SD_task_schedule(task2, 2, sg_host_list(), no_cost, communication_amount2, -1.0); SD_task_dependency_add(NULL, NULL, root, task1); SD_task_dependency_add(NULL, NULL, root, task2); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); time = SD_get_clock();