Merge pull request #17 from mpoquet/master

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

diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index 0656eb2..1046db4 100644 (file)
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -6,7 +6,7 @@
 
 #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  */
@@ -162,23 +162,11 @@ int main(int argc, char *argv[])
   MSG_init(&argc, argv);
 
   if (argc != 3) {
-    XBT_CRITICAL("Usage: %s platform_file deployment_file <model>\n",
+    XBT_CRITICAL("Usage: %s platform_file deployment_file\n",
               argv[0]);
-    XBT_CRITICAL
-        ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",
-         argv[0]);
-    exit(1);
+    xbt_die("example: %s msg_platform.xml msg_deployment.xml\n",argv[0]);
   }
 
-  /* 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]);
-
   res = test_all(argv[1], argv[2]);
 
   XBT_INFO("Total simulation time: %e", MSG_get_clock());