X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e6cdac131b649b1ccd7d8e8c5fe85c0dcf57904..7fd073cc7b2b6a385a0e5c14ff4ee4c82c1667da:/teshsuite/simdag/availability/availability_test.c diff --git a/teshsuite/simdag/availability/availability_test.c b/teshsuite/simdag/availability/availability_test.c index 8a397b6a73..02a70204ea 100644 --- a/teshsuite/simdag/availability/availability_test.c +++ b/teshsuite/simdag/availability/availability_test.c @@ -1,9 +1,15 @@ +/* Copyright (c) 2013-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 #include #include #include #include -#include +#include #include #include #include @@ -63,12 +69,11 @@ static void scheduleDAX(xbt_dynar_t dax) SD_task_t task; const SD_workstation_t *ws_list = SD_workstation_get_list(); - int totalHosts = SD_workstation_get_number(); + int totalHosts = SD_workstation_get_count(); qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t), name_compare_hosts); - int count = SD_workstation_get_number(); - //fprintf(stdout, "No. workstations: %d, %d\n", count, (dax != NULL)); + //fprintf(stdout, "No. workstations: %d, %d\n", totalHosts, (dax != NULL)); xbt_dynar_foreach(dax, cursor, task) { if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) { @@ -79,8 +84,8 @@ static void scheduleDAX(xbt_dynar_t dax) SD_task_schedulel(task, 1, ws_list[0]); } else { fprintf(stdout, "Scheduling %s to node: %s\n", SD_task_get_name(task), - SD_workstation_get_name(ws_list[(cursor) % count])); - SD_task_schedulel(task, 1, ws_list[(cursor) % count]); + SD_workstation_get_name(ws_list[(cursor) % totalHosts])); + SD_task_schedulel(task, 1, ws_list[(cursor) % totalHosts]); } } } @@ -138,8 +143,7 @@ static xbt_dynar_t initDynamicThrottling(int *argc, char *argv[]) fprintf(stdout, "Scheduling DAX...\n"); scheduleDAX(dax); fprintf(stdout, "DAX scheduled\n"); - xbt_dynar_t ret = SD_simulate(-1); - xbt_dynar_free(&ret); + SD_simulate(-1); fprintf(stdout, "Simulation end. Time: %f\n", SD_get_clock()); return dax;