X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a1d7fb09c29089971a104069a5b0af935892e41b..7ac4abc35931448d0bbc5f3c1260320dfe4110c9:/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..3bbfe40295 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,41 +7,35 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_waitall, "Messages specific for this msg example");
 
-/** @addtogroup MSG_examples
- * 
- * - <b>Wait all: async-waitall/async-waitall.c</b>. Illustrates the use of the @ref MSG_comm_waitall function.
- */
-
 static int sender(int argc, char *argv[])
 {
+  xbt_assert(argc==5,"This function expects 4 parameters from the XML deployment file");
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
   double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
   double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
   long receivers_count = xbt_str_parse_int(argv[4], "Invalid amount of receivers: %s");
 
   msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count);
-  int i;
-  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);
+  for (int i = 0; i < number_of_tasks; i++) {
+    char mailbox[80];
+    char taskname[80];
+    snprintf(mailbox,79, "receiver-%ld", i % receivers_count);
+    snprintf(taskname,79, "Task_%d", i);
+    msg_task_t task = MSG_task_create(taskname, 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++) {
+  for (int i = 0; i < receivers_count; i++) {
     char mailbox[80];
-    sprintf(mailbox, "receiver-%ld", i % receivers_count);
-    task = MSG_task_create("finalize", 0, 0, 0);
+    snprintf(mailbox,79, "receiver-%ld", i % receivers_count);
+    msg_task_t 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);
   }
 
   /* Here we are waiting for the completion of all communications */
   MSG_comm_waitall(comm, (number_of_tasks + receivers_count), -1);
-  for (i = 0; i < number_of_tasks + receivers_count; i++)
+  for (int i = 0; i < number_of_tasks + receivers_count; i++)
     MSG_comm_destroy(comm[i]);
 
   XBT_INFO("Goodbye now!");
@@ -52,24 +45,22 @@ static int sender(int argc, char *argv[])
 
 static int receiver(int argc, char *argv[])
 {
-  msg_task_t task = NULL;
-  XBT_ATTRIB_UNUSED msg_error_t res;
-  int id = -1;
+  xbt_assert(argc==2,"This function expects 1 parameter from the XML deployment file");
+  int id = xbt_str_parse_int(argv[1], "Any process of this example must have a numerical name, not %s");
+
   char mailbox[80];
-  msg_comm_t res_irecv;
-  XBT_ATTRIB_UNUSED int read;
-  read = sscanf(argv[1], "%d", &id);
-  xbt_assert(read, "Invalid argument %s\n", argv[1]);
+  snprintf(mailbox,79, "receiver-%d", id);
+   
   MSG_process_sleep(10);
-  sprintf(mailbox, "receiver-%d", id);
   while (1) {
-    res_irecv = MSG_task_irecv(&(task), mailbox);
     XBT_INFO("Wait to receive a task");
-    res = MSG_comm_wait(res_irecv, -1);
-    MSG_comm_destroy(res_irecv);
+    msg_task_t task = NULL;
+    msg_comm_t comm = MSG_task_irecv(&task, mailbox);
+    msg_error_t res = MSG_comm_wait(comm, -1);
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
+    MSG_comm_destroy(comm);
     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;
     }
@@ -78,7 +69,6 @@ static int receiver(int argc, char *argv[])
     MSG_task_execute(task);
     XBT_INFO("\"%s\" done", MSG_task_get_name(task));
     MSG_task_destroy(task);
-    task = NULL;
   }
   XBT_INFO("I'm done. See you!");
   return 0;
@@ -86,8 +76,6 @@ static int receiver(int argc, char *argv[])
 
 int main(int argc, char *argv[])
 {
-  msg_error_t res = MSG_OK;
-
   MSG_init(&argc, argv);
   xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
              "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
@@ -97,7 +85,7 @@ int main(int argc, char *argv[])
   MSG_function_register("receiver", receiver);
   MSG_launch_application(argv[2]);
 
-  res = MSG_main();
+  msg_error_t res = MSG_main();
 
   XBT_INFO("Simulation time %g", MSG_get_clock());