Chord: update some messages displayed

[simgrid.git] / examples / msg / icomms / peer2.c

diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c
old mode 100755 (executable)
new mode 100644 (file)
index 0625a15..0c28719
--- a/examples/msg/icomms/peer2.c
+++ b/examples/msg/icomms/peer2.c
@@ -5,18 +5,20 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdio.h>

-#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h" /* calloc, printf */
+#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "xbt/sysdep.h"         /* calloc, printf */

 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
 #include "xbt/asserts.h"

-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
+                             "Messages specific for this msg example");

 
 int sender(int argc, char *argv[]);
 int receiver(int argc, char *argv[]);
 
 
 int sender(int argc, char *argv[]);
 int receiver(int argc, char *argv[]);
 

-MSG_error_t test_all(const char *platform_file, const char *application_file);
+MSG_error_t test_all(const char *platform_file,
+                     const char *application_file);

 
 /** Sender function  */
 int sender(int argc, char *argv[])
 
 /** Sender function  */
 int sender(int argc, char *argv[])


@@ -26,34 +28,35 @@ int sender(int argc, char *argv[])
   double task_comm_size = atof(argv[3]);
   long receivers_count = atol(argv[4]);
 
   double task_comm_size = atof(argv[3]);
   long receivers_count = atol(argv[4]);
 

-  msg_comm_t *comm = malloc((number_of_tasks+receivers_count)*sizeof(msg_comm_t));
+  msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count);

   int i;
   m_task_t task = NULL;
   int i;
   m_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);
+  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);
     sprintf(sprintf_buffer, "Task_%d", i);

-    task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL);
-    comm[i]=MSG_task_isend(task, mailbox);
-    INFO2("Send to receiver-%ld Task_%d",i % receivers_count,i);
+    task =
+        MSG_task_create(sprintf_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++)
-  {
+  for (i = 0; i < receivers_count; i++) {

     char mailbox[80];
     char mailbox[80];

-    sprintf(mailbox,"receiver-%ld",i % receivers_count);
-    task = MSG_task_create ("finalize", 0, 0, 0);
-    comm[i+number_of_tasks]=MSG_task_isend(task, mailbox);
-    INFO1("Send to receiver-%ld finalize",i % receivers_count);
+    sprintf(mailbox, "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);

 
   }
 
   }

-  /* Here we are waiting for the completion of all communications*/
-  MSG_comm_waitall(comm,(number_of_tasks+receivers_count),-1);
+  /* Here we are waiting for the completion of all communications */
+  MSG_comm_waitall(comm, (number_of_tasks + receivers_count), -1);

 
 

-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
+  xbt_free(comm);

   return 0;
   return 0;

-} /* end_of_sender */
+}                               /* end_of_sender */

 
 /** Receiver function  */
 int receiver(int argc, char *argv[])
 
 /** Receiver function  */
 int receiver(int argc, char *argv[])


@@ -63,52 +66,53 @@ int receiver(int argc, char *argv[])
   int id = -1;
   char mailbox[80];
   msg_comm_t res_irecv;
   int id = -1;
   char mailbox[80];
   msg_comm_t res_irecv;

-  xbt_assert1(sscanf(argv[1],"%d", &id),
-        "Invalid argument %s\n",argv[1]);
-  MSG_process_sleep (10);
-  sprintf(mailbox,"receiver-%d",id);
-  while(1) {
-       res_irecv = MSG_task_irecv(&(task), mailbox);
-       INFO0("Wait to receive a task");
-       res = MSG_comm_wait(res_irecv,-1);
-       xbt_assert0(res == MSG_OK, "MSG_task_get failed");
-       INFO1("Received \"%s\"", MSG_task_get_name(task));
-       if (!strcmp(MSG_task_get_name(task),"finalize")) {
-         MSG_task_destroy(task);
-         break;
+  int read;
+  read = sscanf(argv[1], "%d", &id);
+  xbt_assert1(read, "Invalid argument %s\n", argv[1]);
+  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);
+    xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+    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);
     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;
   }
     MSG_task_destroy(task);
     task = NULL;
   }

-  INFO0("I'm done. See you!");
+  XBT_INFO("I'm done. See you!");

   return 0;
   return 0;

-} /* end_of_receiver */
+}                               /* end_of_receiver */

 
 /** Test function */
 MSG_error_t test_all(const char *platform_file,
 
 /** Test function */
 MSG_error_t test_all(const char *platform_file,

-                           const char *application_file)
+                     const char *application_file)

 {
   MSG_error_t res = MSG_OK;
 
   /* MSG_config("workstation/model","KCCFLN05"); */
 {
   MSG_error_t res = MSG_OK;
 
   /* MSG_config("workstation/model","KCCFLN05"); */

-  {                            /*  Simulation setting */
+  {                             /*  Simulation setting */

     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }

-  {                            /*   Application deployment */
+  {                             /*   Application deployment */

     MSG_function_register("sender", sender);
     MSG_function_register("receiver", receiver);
     MSG_launch_application(application_file);
   }
   res = MSG_main();
     MSG_function_register("sender", sender);
     MSG_function_register("receiver", receiver);
     MSG_launch_application(application_file);
   }
   res = MSG_main();

-  
-  INFO1("Simulation time %g",MSG_get_clock());
+
+  XBT_INFO("Simulation time %g", MSG_get_clock());

   return res;
   return res;

-} /* end_of_test_all */
+}                               /* end_of_test_all */

 
 
 /** Main function */
 
 
 /** Main function */


@@ -116,18 +120,17 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
 {
   MSG_error_t res = MSG_OK;
 

-  MSG_global_init(&argc,argv);
+  MSG_global_init(&argc, argv);

   if (argc < 3) {
   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);
+    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");
+  res = test_all(argv[1], argv[2]);

   MSG_clean();
 
   MSG_clean();
 

-  if(res==MSG_OK)
+  if (res == MSG_OK)

     return 0;
   else
     return 1;
     return 0;
   else
     return 1;

-} /* end_of_main */
+}                               /* end_of_main */