X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3efc3a757648f3dfeef76629605f8022d1fc8e0..687dd96433495ec61a5ffd5b4437b6e5808993c6:/examples/msg/icomms/peer.c

diff --git a/examples/msg/icomms/peer.c b/examples/msg/icomms/peer.c
index ccf0ac425d..5ed53e09de 100644
--- a/examples/msg/icomms/peer.c
+++ b/examples/msg/icomms/peer.c
@@ -14,10 +14,21 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+/** @addtogroup MSG_examples
+ * 
+ * @section MSG_ex_icomms Asynchronous communications
+ * 
+ * There is several examples of asynchronous communications coming in
+ * the archive. In addition to the fully documented example \ref
+ * MSG_ex_asynchronous_communications, there is several other
+ * examples in the archive:
+ * 
+ * - <b>msg/icomms/peer.c</b>: basic example of async functions (@ref MSG_task_isend, @ref MSG_task_irecv, @ref MSG_comm_wait)
+ */
 int sender(int argc, char *argv[]);
 int receiver(int argc, char *argv[]);
 
-MSG_error_t test_all(const char *platform_file,
+msg_error_t test_all(const char *platform_file,
                      const char *application_file);
 
 /** Sender function  */
@@ -30,12 +41,12 @@ int sender(int argc, char *argv[])
   double sleep_start_time = atof(argv[5]);
   double sleep_test_time = atof(argv[6]);
 
-  INFO2("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time,
+  XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time,
         sleep_test_time);
 
   msg_comm_t comm = NULL;
   int i;
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
   MSG_process_sleep(sleep_start_time);
   for (i = 0; i < number_of_tasks; i++) {
     char mailbox[256];
@@ -48,7 +59,7 @@ int sender(int argc, char *argv[])
         MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
                         NULL);
     comm = MSG_task_isend(task, mailbox);
-    INFO2("Send to receiver-%ld Task_%d", i % receivers_count, i);
+    XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i);
 
     if (sleep_test_time == 0) {
       MSG_comm_wait(comm, -1);
@@ -66,7 +77,7 @@ int sender(int argc, char *argv[])
     sprintf(mailbox, "receiver-%ld", i % receivers_count);
     task = MSG_task_create("finalize", 0, 0, 0);
     comm = MSG_task_isend(task, mailbox);
-    INFO1("Send to receiver-%ld finalize", i % receivers_count);
+    XBT_INFO("Send to receiver-%ld finalize", i % receivers_count);
     if (sleep_test_time == 0) {
       MSG_comm_wait(comm, -1);
     } else {
@@ -78,24 +89,26 @@ int sender(int argc, char *argv[])
 
   }
 
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
   return 0;
 }                               /* end_of_sender */
 
 /** Receiver function  */
 int receiver(int argc, char *argv[])
 {
-  m_task_t task = NULL;
-  MSG_error_t res;
+  msg_task_t task = NULL;
+  _XBT_GNUC_UNUSED msg_error_t res;
   int id = -1;
   char mailbox[80];
   msg_comm_t res_irecv;
   double sleep_start_time = atof(argv[2]);
   double sleep_test_time = atof(argv[3]);
-  INFO2("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time,
+  XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time,
         sleep_test_time);
 
-  xbt_assert1(sscanf(argv[1], "%d", &id),
+  _XBT_GNUC_UNUSED int read;
+  read = sscanf(argv[1], "%d", &id);
+  xbt_assert(read,
               "Invalid argument %s\n", argv[1]);
 
   MSG_process_sleep(sleep_start_time);
@@ -103,11 +116,11 @@ int receiver(int argc, char *argv[])
   sprintf(mailbox, "receiver-%d", id);
   while (1) {
     res_irecv = MSG_task_irecv(&(task), mailbox);
-    INFO0("Wait to receive a task");
+    XBT_INFO("Wait to receive a task");
 
     if (sleep_test_time == 0) {
       res = MSG_comm_wait(res_irecv, -1);
-      xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+      xbt_assert(res == MSG_OK, "MSG_task_get failed");
     } else {
       while (MSG_comm_test(res_irecv) == 0) {
         MSG_process_sleep(sleep_test_time);
@@ -115,31 +128,30 @@ int receiver(int argc, char *argv[])
       MSG_comm_destroy(res_irecv);
     }
 
-    INFO1("Received \"%s\"", MSG_task_get_name(task));
+    XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
       MSG_task_destroy(task);
       break;
     }
 
-    INFO1("Processing \"%s\"", MSG_task_get_name(task));
+    XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
     MSG_task_execute(task);
-    INFO1("\"%s\" done", MSG_task_get_name(task));
+    XBT_INFO("\"%s\" done", MSG_task_get_name(task));
     MSG_task_destroy(task);
     task = NULL;
   }
-  INFO0("I'm done. See you!");
+  XBT_INFO("I'm done. See you!");
   return 0;
 }                               /* end_of_receiver */
 
 /** Test function */
-MSG_error_t test_all(const char *platform_file,
+msg_error_t test_all(const char *platform_file,
                      const char *application_file)
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
   /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
-    MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
@@ -149,7 +161,7 @@ MSG_error_t test_all(const char *platform_file,
   }
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }                               /* end_of_test_all */
 
@@ -157,17 +169,15 @@ MSG_error_t test_all(const char *platform_file,
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
     exit(1);
   }
   res = test_all(argv[1], argv[2]);
-  SIMIX_message_sizes_output("toto.txt");
-  MSG_clean();
 
   if (res == MSG_OK)
     return 0;