Merge back master branch

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

diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index 58b6b09..cd5ea88 100644 (file)
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -1,5 +1,6 @@
-/*     $Id$        */
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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. */
 
@@ -18,7 +19,8 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 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);
 
 typedef enum {
   PORT_22 = 0,
@@ -38,35 +40,37 @@ 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();
   }
 
   /* Latency */
   time = MSG_get_clock();
   sprintf(sprintf_buffer_la, "latency task");
-  task_la = MSG_task_create(sprintf_buffer_la, 0.0, task_comm_size_lat, NULL);
+  task_la =
+      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));
+  XBT_INFO("task_la->data = %le", *((double *) task_la->data));
   MSG_task_put(task_la, host, PORT_22);
 
   /* Bandwidth */
   time = MSG_get_clock();
   sprintf(sprintf_buffer_bw, "bandwidth task");
-  task_bw = MSG_task_create(sprintf_buffer_bw, 0.0, task_comm_size_bw, NULL);
+  task_bw =
+      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));
+  XBT_INFO("task_bw->data = %le", *((double *) task_bw->data));
   MSG_task_put(task_bw, host, PORT_22);
 
   return 0;
@@ -81,7 +85,7 @@ int receiver(int argc, char *argv[])
   int a;
   double communication_time = 0;
 
-  INFO0("receiver");
+  XBT_INFO("receiver");
 
   time = MSG_get_clock();
 
@@ -92,12 +96,13 @@ int receiver(int argc, char *argv[])
     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");
   }
 
 
@@ -108,12 +113,13 @@ int receiver(int argc, char *argv[])
     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");
   }
 
 
@@ -122,18 +128,18 @@ int receiver(int argc, char *argv[])
 
 
 /** Test function */
-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)
 {
 
   MSG_error_t res = MSG_OK;
 
 
 
-  INFO0("test_all");
+  XBT_INFO("test_all");
 
   /*  Simulation setting */
   MSG_set_channel_number(MAX_CHANNEL);
-  MSG_paje_output("msg_test.trace");
   MSG_create_environment(platform_file);
 
   /*   Application deployment */
@@ -154,32 +160,34 @@ int main(int argc, char *argv[])
   MSG_error_t res = MSG_OK;
 
 #ifdef _MSC_VER
-  unsigned int prev_exponent_format = _set_output_format(_TWO_DIGIT_EXPONENT);
+  unsigned int prev_exponent_format =
+      _set_output_format(_TWO_DIGIT_EXPONENT);
 #endif
 
   MSG_global_init(&argc, argv);
 
 
   if (argc != 3) {
-    CRITICAL1("Usage: %s platform_file deployment_file <model>\n", argv[0]);
-    CRITICAL1
-      ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",
-       argv[0]);
+    XBT_CRITICAL("Usage: %s platform_file deployment_file <model>\n",
+              argv[0]);
+    XBT_CRITICAL
+        ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",
+         argv[0]);
     exit(1);
   }
 
-  /* Options for the workstation_model:
+  /* Options for the workstation/model:
 
      KCCFLN05              => for maxmin
      KCCFLN05_proportional => for proportional (Vegas)
      KCCFLN05_Vegas        => for TCP Vegas
      KCCFLN05_Reno         => for TCP Reno
    */
-  //MSG_config("workstation_model", argv[3]);
+  //MSG_config("workstation/model", argv[3]);
 
   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();