X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ed9b07e5c0c7eb6d4d38b0fe5aaea80d6996a8a7..5367d14cee11f6e79168382bb14cbd873675a681:/examples/msg/parallel_task/test_ptask.c diff --git a/examples/msg/parallel_task/test_ptask.c b/examples/msg/parallel_task/test_ptask.c index 189a26c754..1618944298 100644 --- a/examples/msg/parallel_task/test_ptask.c +++ b/examples/msg/parallel_task/test_ptask.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2014. The SimGrid Team. +/* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -38,12 +38,12 @@ int execute(int argc, char *argv[]) XBT_DEBUG("host_list_size=%d", host_list_size); m_host_list = calloc(host_list_size, sizeof(msg_host_t)); for (i = 1; i <= host_list_size; i++) { - m_host_list[i - 1] = MSG_get_host_by_name(argv[i]); + m_host_list[i - 1] = MSG_host_by_name(argv[i]); xbt_assert(m_host_list[i - 1] != NULL, "Unknown host %s. Stopping Now! ", argv[i]); } - _XBT_GNUC_UNUSED int read; + XBT_ATTRIB_UNUSED int read; read = sscanf(argv[argc - 2], "%lg", &computation_amount); xbt_assert(read, "Invalid argument %s\n", argv[argc - 2]); read = sscanf(argv[argc - 1], "%lg", &communication_amount); @@ -94,12 +94,12 @@ int redistribute(int argc, char *argv[]) XBT_DEBUG("host_list_size=%d", host_list_size); m_host_list = calloc(host_list_size, sizeof(msg_host_t)); for (i = 1; i <= host_list_size; i++) { - m_host_list[i - 1] = MSG_get_host_by_name(argv[i]); + m_host_list[i - 1] = MSG_host_by_name(argv[i]); xbt_assert(m_host_list[i - 1] != NULL, "Unknown host %s. Stopping Now! ", argv[i]); } - _XBT_GNUC_UNUSED int read; + XBT_ATTRIB_UNUSED int read; read = sscanf(argv[argc - 1], "%lg", &communication_amount); xbt_assert(read, "Invalid argument %s\n", argv[argc - 1]); computation_duration = (double *) calloc(host_list_size, sizeof(double)); @@ -136,7 +136,7 @@ msg_error_t test_all(const char *platform_file, msg_error_t res = MSG_OK; - MSG_config("workstation/model", "ptask_L07"); + MSG_config("host/model", "ptask_L07"); /* Simulation setting */ MSG_create_environment(platform_file);