X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..559d7b23dc0315a3d8ee12878458b176773ed689:/examples/msg/sendrecv/sendrecv.c

diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index 0656eb2d89..ca12844df9 100644
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -1,12 +1,12 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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. */
 
-#include<stdio.h>
+#include <stdio.h>
 
-#include "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
+#include "simgrid/msg.h"            /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
 #include "xbt/sysdep.h"         /* calloc */
 
 /* Create a log channel to have nice outputs. */
@@ -29,7 +29,7 @@ int receiver(int argc, char *argv[]);
 msg_error_t test_all(const char *platform_file,
                      const char *application_file);
 
-double task_comm_size_lat = 10e0;
+double task_comm_size_lat = 1;
 double task_comm_size_bw = 10e8;
 
 /** Emitter function  */
@@ -48,12 +48,9 @@ int sender(int argc, char *argv[])
 
   XBT_INFO("host = %s", argv[1]);
 
-  host = MSG_get_host_by_name(argv[1]);
+  host = MSG_host_by_name(argv[1]);
 
-  if (host == NULL) {
-    XBT_INFO("Unknown host %s. Stopping Now! ", argv[1]);
-    abort();
-  }
+  xbt_assert(host != NULL, "Unknown host %s. Stopping Now! ", argv[1]);
 
   /* Latency */
   time = MSG_get_clock();
@@ -91,36 +88,33 @@ int receiver(int argc, char *argv[])
 
   /* Get Latency */
   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;
-    XBT_INFO("Task received : %s", task_la->name);
-    xbt_free(task_la->data);
-    MSG_task_destroy(task_la);
-    XBT_INFO("Communic. time %e", communication_time);
-    XBT_INFO("--- la %f ----", communication_time);
-  } else {
-    xbt_die("Unexpected behavior");
-  }
+
+  xbt_assert(a == MSG_OK, "Unexpected behavior");
+
+  time1 = MSG_get_clock();
+  sender_time = *((double *) (task_la->data));
+  time = sender_time;
+  communication_time = time1 - time;
+  XBT_INFO("Task received : %s", task_la->name);
+  xbt_free(task_la->data);
+  MSG_task_destroy(task_la);
+  XBT_INFO("Communic. time %e", communication_time);
+  XBT_INFO("--- la %f ----", communication_time);
 
   /* Get Bandwidth */
   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;
-    XBT_INFO("Task received : %s", task_bw->name);
-    xbt_free(task_bw->data);
-    MSG_task_destroy(task_bw);
-    XBT_INFO("Communic. time %e", communication_time);
-    XBT_INFO("--- bw %f ----", task_comm_size_bw / communication_time);
-  } else {
-    xbt_die("Unexpected behavior");
-  }
 
+  xbt_assert(a == MSG_OK, "Unexpected behavior");
+
+  time1 = MSG_get_clock();
+  sender_time = *((double *) (task_bw->data));
+  time = sender_time;
+  communication_time = time1 - time;
+  XBT_INFO("Task received : %s", task_bw->name);
+  xbt_free(task_bw->data);
+  MSG_task_destroy(task_bw);
+  XBT_INFO("Communic. time %e", communication_time);
+  XBT_INFO("--- bw %f ----", task_comm_size_bw / communication_time);
 
   return 0;
 }                               /* end_of_receiver */
@@ -161,23 +155,8 @@ int main(int argc, char *argv[])
 
   MSG_init(&argc, argv);
 
-  if (argc != 3) {
-    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:
-
-     KCCFLN05              => for maxmin
-     KCCFLN05_proportional => for proportional (Vegas)
-     KCCFLN05_Vegas        => for TCP Vegas
-     KCCFLN05_Reno         => for TCP Reno
-   */
-  //MSG_config("workstation/model", argv[3]);
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+	     "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
 
   res = test_all(argv[1], argv[2]);
 
@@ -187,8 +166,5 @@ int main(int argc, char *argv[])
   _set_output_format(prev_exponent_format);
 #endif
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  return res != MSG_OK;
 }                               /* end_of_main */