X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0821eaf865ee5431f938481ede3c2e77ef095f65..d585270b26b26b64e71b90cb41d1e7c1bf2e3677:/examples/msg/sendrecv/sendrecv.c
diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c
index a59aa5471d..e2e7d3f5ff 100644
--- a/examples/msg/sendrecv/sendrecv.c
+++ b/examples/msg/sendrecv/sendrecv.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@ -14,7 +14,7 @@
#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).
@@ -26,7 +26,7 @@ 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,
+msg_error_t test_all(const char *platform_file,
const char *application_file);
double task_comm_size_lat = 10e0;
@@ -35,16 +35,16 @@ double task_comm_size_bw = 10e8;
/** Emitter function */
int sender(int argc, char *argv[])
{
- m_host_t host = NULL;
+ msg_host_t host = NULL;
double time;
- m_task_t task_la = NULL;
- m_task_t task_bw = NULL;
+ msg_task_t task_la = NULL;
+ msg_task_t task_bw = NULL;
char sprintf_buffer_la[64];
char sprintf_buffer_bw[64];
XBT_INFO("sender");
- /*host = xbt_new0(m_host_t,1); */
+ /*host = xbt_new0(msg_host_t,1); */
XBT_INFO("host = %s", argv[1]);
@@ -82,15 +82,13 @@ int sender(int argc, char *argv[])
int receiver(int argc, char *argv[])
{
double time, time1, sender_time;
- m_task_t task_la = NULL;
- m_task_t task_bw = NULL;
+ msg_task_t task_la = NULL;
+ msg_task_t task_bw = NULL;
int a;
double communication_time = 0;
XBT_INFO("receiver");
- time = MSG_get_clock();
-
/* Get Latency */
a = MSG_task_receive(&task_la,MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
@@ -107,7 +105,6 @@ int receiver(int argc, char *argv[])
xbt_die("Unexpected behavior");
}
-
/* Get Bandwidth */
a = MSG_task_receive(&task_bw,MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
@@ -130,13 +127,10 @@ int receiver(int argc, char *argv[])
/** Test function */
-MSG_error_t test_all(const char *platform_file,
+msg_error_t test_all(const char *platform_file,
const char *application_file)
{
-
- MSG_error_t res = MSG_OK;
-
-
+ msg_error_t res = MSG_OK;
XBT_INFO("test_all");
@@ -158,15 +152,14 @@ MSG_error_t test_all(const char *platform_file,
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
#ifdef _MSC_VER
unsigned int prev_exponent_format =
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
- MSG_global_init(&argc, argv);
-
+ MSG_init(&argc, argv);
if (argc != 3) {
XBT_CRITICAL("Usage: %s platform_file deployment_file \n",
@@ -190,8 +183,6 @@ int main(int argc, char *argv[])
XBT_INFO("Total simulation time: %le", MSG_get_clock());
- MSG_clean();
-
#ifdef _MSC_VER
_set_output_format(prev_exponent_format);
#endif