A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into S4U
[simgrid.git]
/
examples
/
msg
/
sendrecv
/
sendrecv.c
diff --git
a/examples/msg/sendrecv/sendrecv.c
b/examples/msg/sendrecv/sendrecv.c
index d413535edb5d972902aeb9725b0d8720403083d3..d889a34cddbe01053a3b5474328a3d2568c7b434 100644
(file)
--- 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
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-6,50
+6,52
@@
#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. */
#include "xbt/log.h"
#include "xbt/asserts.h"
#include "xbt/sysdep.h" /* calloc */
/* Create a log channel to have nice outputs. */
#include "xbt/log.h"
#include "xbt/asserts.h"
+/** @addtogroup MSG_examples
+ *
+ * - <b>sendrecv/sendrecv.c: Ping-pong example</b>. 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[]);
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,
+
msg
_error_t test_all(const char *platform_file,
const char *application_file);
const char *application_file);
-typedef enum {
- PORT_22 = 0,
- MAX_CHANNEL
-} channel_t;
-
-double task_comm_size_lat = 10e0;
+double task_comm_size_lat = 1;
double task_comm_size_bw = 10e8;
/** Emitter function */
int sender(int argc, char *argv[])
{
double task_comm_size_bw = 10e8;
/** Emitter function */
int sender(int argc, char *argv[])
{
- m_host_t host = NULL;
+ m
sg
_host_t host = NULL;
double time;
double time;
- m_task_t task_la = NULL;
- m_task_t task_bw = NULL;
+ m
sg
_task_t task_la = NULL;
+ m
sg
_task_t task_bw = NULL;
char sprintf_buffer_la[64];
char sprintf_buffer_bw[64];
char sprintf_buffer_la[64];
char sprintf_buffer_bw[64];
-
INFO0
("sender");
+
XBT_INFO
("sender");
- /*host = xbt_new0(m_host_t,1); */
+ /*host = xbt_new0(m
sg
_host_t,1); */
-
INFO1
("host = %s", argv[1]);
+
XBT_INFO
("host = %s", argv[1]);
- host = MSG_
get_
host_by_name(argv[1]);
+ host = MSG_host_by_name(argv[1]);
if (host == NULL) {
if (host == NULL) {
-
INFO1
("Unknown host %s. Stopping Now! ", argv[1]);
+
XBT_INFO
("Unknown host %s. Stopping Now! ", argv[1]);
abort();
}
abort();
}
@@
-60,8
+62,8
@@
int sender(int argc, char *argv[])
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;
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 = %l
e", *((double *) task_la->data));
- MSG_task_
put(task_la, host, PORT_22
);
+
XBT_INFO("task_la->data = %
e", *((double *) task_la->data));
+ MSG_task_
send(task_la, argv[1]
);
/* Bandwidth */
time = MSG_get_clock();
/* Bandwidth */
time = MSG_get_clock();
@@
-70,8
+72,8
@@
int sender(int argc, char *argv[])
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;
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 = %l
e", *((double *) task_bw->data));
- MSG_task_
put(task_bw, host, PORT_22
);
+
XBT_INFO("task_bw->data = %
e", *((double *) task_bw->data));
+ MSG_task_
send(task_bw, argv[1]
);
return 0;
} /* end_of_client */
return 0;
} /* end_of_client */
@@
-80,44
+82,43
@@
int sender(int argc, char *argv[])
int receiver(int argc, char *argv[])
{
double time, time1, sender_time;
int receiver(int argc, char *argv[])
{
double time, time1, sender_time;
- m_task_t task_la = NULL;
- m_task_t task_bw = NULL;
+ m
sg
_task_t task_la = NULL;
+ m
sg
_task_t task_bw = NULL;
int a;
double communication_time = 0;
int a;
double communication_time = 0;
- INFO0("receiver");
-
- time = MSG_get_clock();
+ XBT_INFO("receiver");
/* Get Latency */
/* 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;
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);
MSG_task_destroy(task_la);
-
INFO1("Communic. time %l
e", communication_time);
-
INFO1
("--- la %f ----", communication_time);
+
XBT_INFO("Communic. time %
e", communication_time);
+
XBT_INFO
("--- la %f ----", communication_time);
} else {
} else {
- xbt_
assert0(0,
"Unexpected behavior");
+ xbt_
die(
"Unexpected behavior");
}
}
-
/* Get Bandwidth */
/* 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;
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);
MSG_task_destroy(task_bw);
-
INFO1("Communic. time %l
e", communication_time);
-
INFO1
("--- bw %f ----", task_comm_size_bw / communication_time);
+
XBT_INFO("Communic. time %
e", communication_time);
+
XBT_INFO
("--- bw %f ----", task_comm_size_bw / communication_time);
} else {
} else {
- xbt_
assert0(0,
"Unexpected behavior");
+ xbt_
die(
"Unexpected behavior");
}
}
@@
-126,18
+127,14
@@
int receiver(int argc, char *argv[])
/** Test function */
/** Test function */
-
MSG
_error_t test_all(const char *platform_file,
+
msg
_error_t test_all(const char *platform_file,
const char *application_file)
{
const char *application_file)
{
+ msg_error_t res = MSG_OK;
- MSG_error_t res = MSG_OK;
-
-
-
- INFO0("test_all");
+ XBT_INFO("test_all");
/* Simulation setting */
/* Simulation setting */
- MSG_set_channel_number(MAX_CHANNEL);
MSG_create_environment(platform_file);
/* Application deployment */
MSG_create_environment(platform_file);
/* Application deployment */
@@
-155,39
+152,24
@@
MSG_error_t test_all(const char *platform_file,
/** Main function */
int main(int argc, char *argv[])
{
/** 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
#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) {
if (argc != 3) {
-
CRITICAL1("Usage: %s platform_file deployment_file <model>
\n",
+
XBT_CRITICAL("Usage: %s platform_file deployment_file
\n",
argv[0]);
argv[0]);
- CRITICAL1
- ("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]);
res = test_all(argv[1], argv[2]);
- INFO1("Total simulation time: %le", MSG_get_clock());
-
- MSG_clean();
+ XBT_INFO("Total simulation time: %e", MSG_get_clock());
#ifdef _MSC_VER
_set_output_format(prev_exponent_format);
#ifdef _MSC_VER
_set_output_format(prev_exponent_format);