X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63f4cba590c1f4074f4891408b3a6cd6d8440eda..eba5ae1edf4ba60747de3d624ab2a34bdc2f5b84:/examples/msg/async-waitall/async-waitall.c diff --git a/examples/msg/async-waitall/async-waitall.c b/examples/msg/async-waitall/async-waitall.c index bc3db3b849..b3a0b4dcd1 100644 --- a/examples/msg/async-waitall/async-waitall.c +++ b/examples/msg/async-waitall/async-waitall.c @@ -1,5 +1,4 @@ -/* Copyright (c) 2010-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2016. 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. */ @@ -8,11 +7,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this msg example"); -/** @addtogroup MSG_examples - * - * - Wait all: async-waitall/async-waitall.c. Illustrates the use of the @ref MSG_comm_waitall function. - */ - static int sender(int argc, char *argv[]) { long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); @@ -25,16 +19,16 @@ static int sender(int argc, char *argv[]) msg_task_t task = NULL; for (i = 0; i < number_of_tasks; i++) { char mailbox[256]; - char sprintf_buffer[256]; - sprintf(mailbox, "receiver-%ld", i % receivers_count); - sprintf(sprintf_buffer, "Task_%d", i); - task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL); + char snprintf_buffer[256]; + snprintf(mailbox,255, "receiver-%ld", i % receivers_count); + snprintf(snprintf_buffer,255, "Task_%d", i); + task = MSG_task_create(snprintf_buffer, task_comp_size, task_comm_size, NULL); comm[i] = MSG_task_isend(task, mailbox); XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i); } for (i = 0; i < receivers_count; i++) { char mailbox[80]; - sprintf(mailbox, "receiver-%ld", i % receivers_count); + snprintf(mailbox,79, "receiver-%ld", i % receivers_count); task = MSG_task_create("finalize", 0, 0, 0); comm[i + number_of_tasks] = MSG_task_isend(task, mailbox); XBT_INFO("Send to receiver-%ld finalize", i % receivers_count); @@ -61,7 +55,7 @@ static int receiver(int argc, char *argv[]) read = sscanf(argv[1], "%d", &id); xbt_assert(read, "Invalid argument %s\n", argv[1]); MSG_process_sleep(10); - sprintf(mailbox, "receiver-%d", id); + snprintf(mailbox,79, "receiver-%d", id); while (1) { res_irecv = MSG_task_irecv(&(task), mailbox); XBT_INFO("Wait to receive a task"); @@ -69,7 +63,7 @@ static int receiver(int argc, char *argv[]) MSG_comm_destroy(res_irecv); xbt_assert(res == MSG_OK, "MSG_task_get failed"); XBT_INFO("Received \"%s\"", MSG_task_get_name(task)); - if (!strcmp(MSG_task_get_name(task), "finalize")) { + if (strcmp(MSG_task_get_name(task), "finalize") == 0) { MSG_task_destroy(task); break; }