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 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_mailbox.c
diff --git
a/examples/msg/masterslave/masterslave_mailbox.c
b/examples/msg/masterslave/masterslave_mailbox.c
index
3543f23
..
e2ab938
100644
(file)
--- a/
examples/msg/masterslave/masterslave_mailbox.c
+++ b/
examples/msg/masterslave/masterslave_mailbox.c
@@
-16,9
+16,6
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
-int forwarder(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file,
- const char *application_file);
/** Emitter function */
int master(int argc, char *argv[])
/** Emitter function */
int master(int argc, char *argv[])
@@
-36,7
+33,7
@@
int master(int argc, char *argv[])
for (i = 0; i < number_of_tasks; i++) {
char mailbox[256];
char sprintf_buffer[256];
for (i = 0; i < number_of_tasks; i++) {
char mailbox[256];
char sprintf_buffer[256];
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
sprintf(mailbox, "slave-%ld", i % slaves_count);
sprintf(sprintf_buffer, "Task_%d", i);
sprintf(mailbox, "slave-%ld", i % slaves_count);
sprintf(sprintf_buffer, "Task_%d", i);
@@
-56,7
+53,7
@@
int master(int argc, char *argv[])
char mailbox[80];
sprintf(mailbox, "slave-%ld", i % slaves_count);
char mailbox[80];
sprintf(mailbox, "slave-%ld", i % slaves_count);
- m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+ m
sg
_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
MSG_task_send(finalize, mailbox);
}
MSG_task_send(finalize, mailbox);
}
@@
-67,7
+64,7
@@
int master(int argc, char *argv[])
/** Receiver function */
int slave(int argc, char *argv[])
{
/** Receiver function */
int slave(int argc, char *argv[])
{
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
_XBT_GNUC_UNUSED int res;
int id = -1;
char mailbox[80];
_XBT_GNUC_UNUSED int res;
int id = -1;
char mailbox[80];
@@
-100,7
+97,7
@@
int slave(int argc, char *argv[])
/** Main function */
int main(int argc, char *argv[])
{
/** Main function */
int main(int argc, char *argv[])
{
-
MSG
_error_t res;
+
msg
_error_t res;
const char *platform_file;
const char *application_file;
const char *platform_file;
const char *application_file;
@@
-125,7
+122,6
@@
int main(int argc, char *argv[])
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
res = MSG_main();
XBT_INFO("Simulation time %g", MSG_get_clock());
- MSG_clean();
if (res == MSG_OK)
return 0;
if (res == MSG_OK)
return 0;