Deprecate functions MSG_global_init() / MSG_global_init_args() in flavor of MSG_init()

[simgrid.git] / examples / msg / sendrecv / sendrecv.c

diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index a16f9cc..1e2dc06 100644 (file)
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -13,6 +13,13 @@
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
+/** @addtogroup MSG_examples
+ * 
+ *  - <b>sendrecv/sendrecv.c: Ping-pong example</b>. It's hard to
+ *    think of a simpler example. The tesh files laying in the
+ *    directory are instructive concerning the way to pass options to the simulators (as described in \ref options).
+ */
+
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
@@ -22,11 +29,6 @@ int receiver(int argc, char *argv[]);
 MSG_error_t test_all(const char *platform_file,
                      const char *application_file);
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
 double task_comm_size_lat = 10e0;
 double task_comm_size_bw = 10e8;
 
@@ -40,16 +42,16 @@ int sender(int argc, char *argv[])
   char sprintf_buffer_la[64];
   char sprintf_buffer_bw[64];
 
-  INFO0("sender");
+  XBT_INFO("sender");
 
   /*host = xbt_new0(m_host_t,1); */
 
-  INFO1("host = %s", argv[1]);
+  XBT_INFO("host = %s", argv[1]);
 
   host = MSG_get_host_by_name(argv[1]);
 
   if (host == NULL) {
-    INFO1("Unknown host %s. Stopping Now! ", argv[1]);
+    XBT_INFO("Unknown host %s. Stopping Now! ", argv[1]);
     abort();
   }
 
@@ -60,8 +62,8 @@ int sender(int argc, char *argv[])
       MSG_task_create(sprintf_buffer_la, 0.0, task_comm_size_lat, NULL);
   task_la->data = xbt_new(double, 1);
   *(double *) task_la->data = time;
-  INFO1("task_la->data = %le", *((double *) task_la->data));
-  MSG_task_put(task_la, host, PORT_22);
+  XBT_INFO("task_la->data = %le", *((double *) task_la->data));
+  MSG_task_send(task_la, argv[1]);
 
   /* Bandwidth */
   time = MSG_get_clock();
@@ -70,8 +72,8 @@ int sender(int argc, char *argv[])
       MSG_task_create(sprintf_buffer_bw, 0.0, task_comm_size_bw, NULL);
   task_bw->data = xbt_new(double, 1);
   *(double *) task_bw->data = time;
-  INFO1("task_bw->data = %le", *((double *) task_bw->data));
-  MSG_task_put(task_bw, host, PORT_22);
+  XBT_INFO("task_bw->data = %le", *((double *) task_bw->data));
+  MSG_task_send(task_bw, argv[1]);
 
   return 0;
 }                               /* end_of_client */
@@ -85,41 +87,41 @@ int receiver(int argc, char *argv[])
   int a;
   double communication_time = 0;
 
-  INFO0("receiver");
+  XBT_INFO("receiver");
 
   time = MSG_get_clock();
 
   /* Get Latency */
-  a = MSG_task_get(&task_la, PORT_22);
+  a = MSG_task_receive(&task_la,MSG_host_get_name(MSG_host_self()));
   if (a == MSG_OK) {
     time1 = MSG_get_clock();
     sender_time = *((double *) (task_la->data));
     time = sender_time;
     communication_time = time1 - time;
-    INFO1("Task received : %s", task_la->name);
+    XBT_INFO("Task received : %s", task_la->name);
     xbt_free(task_la->data);
     MSG_task_destroy(task_la);
-    INFO1("Communic. time %le", communication_time);
-    INFO1("--- la %f ----", communication_time);
+    XBT_INFO("Communic. time %le", communication_time);
+    XBT_INFO("--- la %f ----", communication_time);
   } else {
-    xbt_assert0(0, "Unexpected behavior");
+    xbt_die("Unexpected behavior");
   }
 
 
   /* Get Bandwidth */
-  a = MSG_task_get(&task_bw, PORT_22);
+  a = MSG_task_receive(&task_bw,MSG_host_get_name(MSG_host_self()));
   if (a == MSG_OK) {
     time1 = MSG_get_clock();
     sender_time = *((double *) (task_bw->data));
     time = sender_time;
     communication_time = time1 - time;
-    INFO1("Task received : %s", task_bw->name);
+    XBT_INFO("Task received : %s", task_bw->name);
     xbt_free(task_bw->data);
     MSG_task_destroy(task_bw);
-    INFO1("Communic. time %le", communication_time);
-    INFO1("--- bw %f ----", task_comm_size_bw / communication_time);
+    XBT_INFO("Communic. time %le", communication_time);
+    XBT_INFO("--- bw %f ----", task_comm_size_bw / communication_time);
   } else {
-    xbt_assert0(0, "Unexpected behavior");
+    xbt_die("Unexpected behavior");
   }
 
 
@@ -136,10 +138,9 @@ MSG_error_t test_all(const char *platform_file,
 
 
 
-  INFO0("test_all");
+  XBT_INFO("test_all");
 
   /*  Simulation setting */
-  MSG_set_channel_number(MAX_CHANNEL);
   MSG_create_environment(platform_file);
 
   /*   Application deployment */
@@ -164,13 +165,13 @@ int main(int argc, char *argv[])
       _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
 
 
   if (argc != 3) {
-    CRITICAL1("Usage: %s platform_file deployment_file <model>\n",
+    XBT_CRITICAL("Usage: %s platform_file deployment_file <model>\n",
               argv[0]);
-    CRITICAL1
+    XBT_CRITICAL
         ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",
          argv[0]);
     exit(1);
@@ -187,7 +188,7 @@ int main(int argc, char *argv[])
 
   res = test_all(argv[1], argv[2]);
 
-  INFO1("Total simulation time: %le", MSG_get_clock());
+  XBT_INFO("Total simulation time: %le", MSG_get_clock());
 
   MSG_clean();