X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdfe4f8674f98efbf2d67ad854ef83a1d5f855ed..1a449d04f5f06f7a6071c046b1881d0c5b3bc221:/examples/simdag/sd_fail.c diff --git a/examples/simdag/sd_fail.c b/examples/simdag/sd_fail.c index 0338b0a151..fc1647cfe4 100644 --- a/examples/simdag/sd_fail.c +++ b/examples/simdag/sd_fail.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2010, 2012-2013. The SimGrid Team. +/* Copyright (c) 2006-2010, 2012-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/ex.h" #include "xbt/log.h" @@ -18,8 +18,7 @@ int main(int argc, char **argv) SD_task_t task; double computation_amount[1]; double communication_amount[2] = { 0 }; - SD_workstation_t workstation_list[1]; - xbt_dynar_t ret; + sg_host_t workstation_list[1]; /* initialization of SD */ SD_init(&argc, argv); @@ -37,10 +36,9 @@ int main(int argc, char **argv) XBT_INFO("Schedule task '%s' on workstation 'Faulty Host'", SD_task_get_name(task)); - SD_task_schedulel(task, 1, SD_workstation_get_by_name("Faulty Host")); + SD_task_schedulel(task, 1, sg_host_by_name("Faulty Host")); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); @@ -51,11 +49,10 @@ int main(int argc, char **argv) XBT_INFO("let's unschedule task '%s' and reschedule it on the 'Safe Host'", SD_task_get_name(task)); SD_task_unschedule(task); - SD_task_schedulel(task, 1, SD_workstation_get_by_name("Safe Host")); + SD_task_schedulel(task, 1, sg_host_by_name("Safe Host")); XBT_INFO("Run the simulation again"); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); XBT_INFO("Task '%s' start time: %f, finish time: %f", @@ -77,12 +74,11 @@ int main(int argc, char **argv) XBT_INFO("Schedule task '%s' on workstation 'Faulty Host'", SD_task_get_name(task)); - workstation_list[0] = SD_workstation_get_by_name("Faulty Host"); + workstation_list[0] = sg_host_by_name("Faulty Host"); SD_task_schedule(task, 1, workstation_list, computation_amount, communication_amount,-1); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); @@ -94,14 +90,13 @@ int main(int argc, char **argv) SD_task_get_name(task)); SD_task_unschedule(task); - workstation_list[0] = SD_workstation_get_by_name("Safe Host"); + workstation_list[0] = sg_host_by_name("Safe Host"); SD_task_schedule(task, 1, workstation_list, computation_amount, communication_amount,-1); XBT_INFO("Run the simulation again"); - ret = SD_simulate(-1.0); - xbt_dynar_free(&ret); + SD_simulate(-1.0); SD_task_dump(task); XBT_INFO("Task '%s' start time: %f, finish time: %f",