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
zu to PRIu64 (again)
[simgrid.git]
/
examples
/
msg
/
icomms
/
peer.c
diff --git
a/examples/msg/icomms/peer.c
b/examples/msg/icomms/peer.c
index
2e5d8ed
..
ef9e78b
100644
(file)
--- a/
examples/msg/icomms/peer.c
+++ b/
examples/msg/icomms/peer.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
-2013
. 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
@@
-28,7
+28,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
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 */
@@
-67,8
+67,8
@@
int sender(int argc, char *argv[])
while (MSG_comm_test(comm) == 0) {
MSG_process_sleep(sleep_test_time);
};
while (MSG_comm_test(comm) == 0) {
MSG_process_sleep(sleep_test_time);
};
- MSG_comm_destroy(comm);
}
}
+ MSG_comm_destroy(comm);
}
}
@@
-84,8
+84,8
@@
int sender(int argc, char *argv[])
while (MSG_comm_test(comm) == 0) {
MSG_process_sleep(sleep_test_time);
};
while (MSG_comm_test(comm) == 0) {
MSG_process_sleep(sleep_test_time);
};
- MSG_comm_destroy(comm);
}
}
+ MSG_comm_destroy(comm);
}
}
@@
-97,7
+97,7
@@
int sender(int argc, char *argv[])
int receiver(int argc, char *argv[])
{
msg_task_t task = NULL;
int receiver(int argc, char *argv[])
{
msg_task_t task = NULL;
- _XBT_GNUC_UNUSED
MSG
_error_t res;
+ _XBT_GNUC_UNUSED
msg
_error_t res;
int id = -1;
char mailbox[80];
msg_comm_t res_irecv;
int id = -1;
char mailbox[80];
msg_comm_t res_irecv;
@@
-125,8
+125,8
@@
int receiver(int argc, char *argv[])
while (MSG_comm_test(res_irecv) == 0) {
MSG_process_sleep(sleep_test_time);
};
while (MSG_comm_test(res_irecv) == 0) {
MSG_process_sleep(sleep_test_time);
};
- MSG_comm_destroy(res_irecv);
}
}
+ MSG_comm_destroy(res_irecv);
XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
if (!strcmp(MSG_task_get_name(task), "finalize")) {
XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
if (!strcmp(MSG_task_get_name(task), "finalize")) {
@@
-145,10
+145,10
@@
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 */
@@
-169,7
+169,7
@@
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_init(&argc, argv);
if (argc < 3) {
MSG_init(&argc, argv);
if (argc < 3) {
@@
-178,7
+178,6
@@
int main(int argc, char *argv[])
exit(1);
}
res = test_all(argv[1], argv[2]);
exit(1);
}
res = test_all(argv[1], argv[2]);
- MSG_clean();
if (res == MSG_OK)
return 0;
if (res == MSG_OK)
return 0;