X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f54e5c450791e19b01f31e86c93e5a603fd0c4b..693f30b46244c152cd79cdf3ad35d4a79b866c9c:/examples/msg/sendrecv/sendrecv.c
diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index 785ae0b04c..1e2dc066de 100644
--- 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. */
@@ -12,18 +13,21 @@
#include "xbt/log.h"
#include "xbt/asserts.h"
+/** @addtogroup MSG_examples
+ *
+ * - sendrecv/sendrecv.c: Ping-pong example. 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");
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);
-
-typedef enum {
- PORT_22 = 0,
- MAX_CHANNEL
-} channel_t;
+MSG_error_t test_all(const char *platform_file,
+ const char *application_file);
double task_comm_size_lat = 10e0;
double task_comm_size_bw = 10e8;
@@ -38,36 +42,38 @@ 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));
- 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();
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));
- 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 */
@@ -81,39 +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");
}
@@ -122,17 +130,17 @@ 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_create_environment(platform_file);
/* Application deployment */
@@ -153,17 +161,19 @@ 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);
+ MSG_init(&argc, argv);
if (argc != 3) {
- CRITICAL1("Usage: %s platform_file deployment_file \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 \n",
+ argv[0]);
+ XBT_CRITICAL
+ ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",
+ argv[0]);
exit(1);
}
@@ -178,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();