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
Finalize properties on AS.
[simgrid.git]
/
examples
/
msg
/
icomms
/
peer3.c
diff --git
a/examples/msg/icomms/peer3.c
b/examples/msg/icomms/peer3.c
index
c9d126b
..
ae82a7c
100644
(file)
--- a/
examples/msg/icomms/peer3.c
+++ b/
examples/msg/icomms/peer3.c
@@
-14,10
+14,15
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
"Messages specific for this msg example");
+/** @addtogroup MSG_examples
+ *
+ * - <b>msg/icomms/peer3.c</b>: demonstrates the @ref MSG_comm_waitany function
+ */
+
int sender(int argc, char *argv[]);
int receiver(int argc, char *argv[]);
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);
/** Sender function */
const char *application_file);
/** Sender function */
@@
-31,7
+36,7
@@
int sender(int argc, char *argv[])
double coef = 0;
xbt_dynar_t d = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int i;
double coef = 0;
xbt_dynar_t d = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int i;
- m_task_t task;
+ m
sg
_task_t task;
char mailbox[256];
char sprintf_buffer[256];
msg_comm_t comm;
char mailbox[256];
char sprintf_buffer[256];
msg_comm_t comm;
@@
-64,7
+69,7
@@
int sender(int argc, char *argv[])
sprintf(mailbox, "finalize");
msg_comm_t res_irecv;
sprintf(mailbox, "finalize");
msg_comm_t res_irecv;
-
MSG
_error_t res_wait;
+
_XBT_GNUC_UNUSED msg
_error_t res_wait;
for (i = 0; i < receivers_count; i++) {
task = NULL;
res_irecv = MSG_task_irecv(&(task), mailbox);
for (i = 0; i < receivers_count; i++) {
task = NULL;
res_irecv = MSG_task_irecv(&(task), mailbox);
@@
-86,9
+91,9
@@
int receiver(int argc, char *argv[])
char mailbox[80];
xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int tasks = atof(argv[2]);
char mailbox[80];
xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL);
int tasks = atof(argv[2]);
- m
_task_t *task = xbt_new(m
_task_t, tasks);
+ m
sg_task_t *task = xbt_new(msg
_task_t, tasks);
- int read;
+
_XBT_GNUC_UNUSED
int read;
read = sscanf(argv[1], "%d", &id);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "receiver-%d", id);
read = sscanf(argv[1], "%d", &id);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
sprintf(mailbox, "receiver-%d", id);
@@
-102,9
+107,9
@@
int receiver(int argc, char *argv[])
}
/* Here we are waiting for the receiving of all communications */
}
/* Here we are waiting for the receiving of all communications */
- m_task_t task_com;
+ m
sg
_task_t task_com;
while (!xbt_dynar_is_empty(comms)) {
while (!xbt_dynar_is_empty(comms)) {
-
MSG
_error_t err;
+
_XBT_GNUC_UNUSED msg
_error_t err;
xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
task_com = MSG_comm_get_task(res_irecv);
MSG_comm_destroy(res_irecv);
xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv);
task_com = MSG_comm_get_task(res_irecv);
MSG_comm_destroy(res_irecv);
@@
-127,14
+132,13
@@
int receiver(int argc, char *argv[])
} /* end_of_receiver */
/** Test function */
} /* end_of_receiver */
/** 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;
/* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
/* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
- MSG_set_channel_number(0);
MSG_create_environment(platform_file);
}
{ /* Application deployment */
MSG_create_environment(platform_file);
}
{ /* Application deployment */
@@
-152,9
+156,9
@@
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;
- MSG_
global_
init(&argc, argv);
+ MSG_init(&argc, argv);
if (argc < 3) {
printf("Usage: %s platform_file deployment_file\n", argv[0]);
printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
if (argc < 3) {
printf("Usage: %s platform_file deployment_file\n", argv[0]);
printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);