X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74ffd4ad21972c63bc21b07b22df673420e0bb47..183a6118a95c570b0c66695505dab7dbebc0c7b3:/examples/msg/async-wait/async-wait.c

diff --git a/examples/msg/async-wait/async-wait.c b/examples/msg/async-wait/async-wait.c
index 814411a868..0c4d599ee9 100644
--- a/examples/msg/async-wait/async-wait.c
+++ b/examples/msg/async-wait/async-wait.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2017. 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. */
@@ -7,9 +7,10 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_async_wait, "Messages specific for this msg example");
 
-/* Sender process expects 6 arguments: */
+/* Main function of the Sender process */
 static int sender(int argc, char *argv[])
 {
+  xbt_assert(argc==7, "The sender function expects 6 arguments from the XML deployment file");
   long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");        /* - number of tasks */
   double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); /* - computational cost */
   double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); /* - communication cost */
@@ -19,44 +20,41 @@ static int sender(int argc, char *argv[])
 
   XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time);
 
-  int i;
-  msg_task_t task = NULL;
-  msg_comm_t comm = NULL;
   MSG_process_sleep(sleep_start_time);
-  for (i = 0; i < number_of_tasks; i++) {
-    char mailbox[256];
-    char snprintf_buffer[256];
+  for (int i = 0; i < number_of_tasks; i++) {
+    char mailbox[80];
+    char taskname[80];
 
-    snprintf(mailbox,255, "receiver-%ld", i % receivers_count);
-    snprintf(snprintf_buffer,255, "Task_%d", i);
+    snprintf(mailbox,79, "receiver-%ld", i % receivers_count);
+    snprintf(taskname,79, "Task_%d", i);
 
     /* This process first creates a task and send it asynchronously with @ref MSG_task_isend. Then, if: */
-    task = MSG_task_create(snprintf_buffer, task_comp_size, task_comm_size, NULL);
-    comm = MSG_task_isend(task, mailbox);
+    msg_task_t task = MSG_task_create(taskname, task_comp_size, task_comm_size, NULL);
+    msg_comm_t comm = MSG_task_isend(task, mailbox);
     XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i);
 
-    if (sleep_test_time == 0) { /* - "test_time" is set to 0, wait on @ref MSG_comm_wait */
-      MSG_comm_wait(comm, -1);
-    } else {
+    if (sleep_test_time > 0) { /* - "test_time" is set to 0, wait on @ref MSG_comm_wait */
       while (MSG_comm_test(comm) == 0) { /* - Call @ref MSG_comm_test every "test_time" otherwise */
         MSG_process_sleep(sleep_test_time);
-      };
+      }
+    } else {
+      MSG_comm_wait(comm, -1);
     }
     MSG_comm_destroy(comm);
   }
 
-  for (i = 0; i < receivers_count; i++) {
+  for (int i = 0; i < receivers_count; i++) {
     char mailbox[80];
-    snprintf(mailbox,79, "receiver-%ld", i % receivers_count);
-    task = MSG_task_create("finalize", 0, 0, 0);
-    comm = MSG_task_isend(task, mailbox);
-    XBT_INFO("Send to receiver-%ld finalize", i % receivers_count);
-    if (sleep_test_time == 0) {
-      MSG_comm_wait(comm, -1);
-    } else {
+    snprintf(mailbox, 79, "receiver-%d", i);
+    msg_task_t task = MSG_task_create("finalize", 0, 0, 0);
+    msg_comm_t comm = MSG_task_isend(task, mailbox);
+    XBT_INFO("Send to receiver-%d finalize", i);
+    if (sleep_test_time > 0) {
       while (MSG_comm_test(comm) == 0) {
         MSG_process_sleep(sleep_test_time);
-      };
+      }
+    } else {
+      MSG_comm_wait(comm, -1);
     }
     MSG_comm_destroy(comm);
   }
@@ -68,10 +66,7 @@ static int sender(int argc, char *argv[])
 /* Receiver process expects 3 arguments: */
 static int receiver(int argc, char *argv[])
 {
-  msg_task_t task = NULL;
-  XBT_ATTRIB_UNUSED msg_error_t res;
-  char mailbox[80];
-  msg_comm_t res_irecv;
+  xbt_assert(argc==4, "The relay_runner function does not accept any parameter from the XML deployment file");
   int id = xbt_str_parse_int(argv[1], "Invalid id: %s");                                        /* - unique id */
   double sleep_start_time = xbt_str_parse_double(argv[2], "Invalid sleep start parameter: %s"); /* - start time */
   double sleep_test_time = xbt_str_parse_double(argv[3], "Invalid sleep test parameter: %s");   /* - test time */
@@ -79,23 +74,25 @@ static int receiver(int argc, char *argv[])
 
   MSG_process_sleep(sleep_start_time); /* This process first sleeps for "start time" seconds.  */
 
+  char mailbox[80];
   snprintf(mailbox,79, "receiver-%d", id);
   while (1) {
-    res_irecv = MSG_task_irecv(&(task), mailbox); /* Then it posts asynchronous receives (@ref MSG_task_irecv) and*/
+    msg_task_t task = NULL;
+    msg_comm_t comm = MSG_task_irecv(&task, mailbox); /* Then it posts asynchronous receives (@ref MSG_task_irecv) and*/
     XBT_INFO("Wait to receive a task");
 
-    if (sleep_test_time == 0) {               /* - if "test_time" is set to 0, wait on @ref MSG_comm_wait */
-      res = MSG_comm_wait(res_irecv, -1);
-      xbt_assert(res == MSG_OK, "MSG_task_get failed");
-    } else {
-      while (MSG_comm_test(res_irecv) == 0) { /* - Call @ref MSG_comm_test every "test_time" otherwise */
+    if (sleep_test_time > 0) {               /* - if "test_time" is set to 0, wait on @ref MSG_comm_wait */
+      while (MSG_comm_test(comm) == 0) {     /* - Call @ref MSG_comm_test every "test_time" otherwise */
         MSG_process_sleep(sleep_test_time);
-      };
+      }
+    } else {
+      msg_error_t res = MSG_comm_wait(comm, -1);
+      xbt_assert(res == MSG_OK, "MSG_task_get failed");
     }
-    MSG_comm_destroy(res_irecv);
+    MSG_comm_destroy(comm);
 
     XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
-    if (!strcmp(MSG_task_get_name(task), "finalize")) { /* If the received task is "finalize", the process ends */
+    if (strcmp(MSG_task_get_name(task), "finalize") == 0) { /* If the received task is "finalize", the process ends */
       MSG_task_destroy(task);
       break;
     }
@@ -104,7 +101,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;
@@ -112,8 +108,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]);
@@ -124,7 +118,7 @@ int main(int argc, char *argv[])
   MSG_function_register("receiver", receiver);
   MSG_launch_application(argv[2]);/* - Deploy the sender and receiver processes */
 
-  res = MSG_main();  /* - Run the simulation */
+  msg_error_t res = MSG_main();  /* - Run the simulation */
 
   XBT_INFO("Simulation time %g", MSG_get_clock());