X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..08b4fe22433e1835814267fcd59c52799ab5b8c1:/examples/msg/masterslave/masterslave_failure.c diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c index 90ffa8752c..ce4eec9007 100644 --- a/examples/msg/masterslave/masterslave_failure.c +++ b/examples/msg/masterslave/masterslave_failure.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2007-2014. The SimGrid Team. +/* Copyright (c) 2007-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 "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ @@ -30,7 +30,7 @@ int master(int argc, char *argv[]) double task_comp_size = 0; double task_comm_size = 0; int i; - _XBT_GNUC_UNUSED int read; + XBT_ATTRIB_UNUSED int read; read = sscanf(argv[1], "%d", &number_of_tasks); xbt_assert(read, "Invalid argument %s\n", argv[1]); @@ -39,12 +39,12 @@ int master(int argc, char *argv[]) read = sscanf(argv[3], "%lg", &task_comm_size); xbt_assert(read, "Invalid argument %s\n", argv[3]); - { /* Process organisation */ + { /* Process organization */ slaves_count = argc - 4; slaves = xbt_new0(msg_host_t, slaves_count); for (i = 4; i < argc; i++) { - slaves[i - 4] = MSG_get_host_by_name(argv[i]); + slaves[i - 4] = MSG_host_by_name(argv[i]); if (slaves[i - 4] == NULL) { XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]); abort(); @@ -183,7 +183,6 @@ msg_error_t test_all(const char *platform_file, { msg_error_t res = MSG_OK; - /* MSG_config("workstation/model","KCCFLN05"); */ { /* Simulation setting */ MSG_create_environment(platform_file); }