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
add the files we need to ensure that make distcheck compiles again
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_console.c
diff --git
a/examples/msg/masterslave/masterslave_console.c
b/examples/msg/masterslave/masterslave_console.c
index
0b54bfa
..
d49df00
100644
(file)
--- a/
examples/msg/masterslave/masterslave_console.c
+++ b/
examples/msg/masterslave/masterslave_console.c
@@
-26,7
+26,7
@@
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[]);
-
MSG
_error_t test_all(const char *);
+
msg
_error_t test_all(const char *);
/** Emitter function */
int master(int argc, char *argv[])
/** Emitter function */
int master(int argc, char *argv[])
@@
-42,7
+42,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);
@@
-61,7
+61,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);
}
@@
-72,7
+72,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];
@@
-104,9
+104,9
@@
int slave(int argc, char *argv[])
} /* end_of_slave */
/** Test function */
} /* end_of_slave */
/** Test function */
-
MSG
_error_t test_all(const char *file) //(void)
+
msg
_error_t test_all(const char *file) //(void)
{
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
/*start by registering functions before loading script */
MSG_function_register("master", master);
/*start by registering functions before loading script */
MSG_function_register("master", master);
@@
-122,16
+122,15
@@
MSG_error_t test_all(const char *file) //(void)
/** 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 < 2) {
printf("Usage: %s platform_script[.lua]\n", argv[0]);
printf("example: %s platform_script.lua\n", argv[0]);
exit(1);
}
res = test_all(argv[1]);
if (argc < 2) {
printf("Usage: %s platform_script[.lua]\n", argv[0]);
printf("example: %s platform_script.lua\n", argv[0]);
exit(1);
}
res = test_all(argv[1]);
- MSG_clean();
if (res == MSG_OK)
return 0;
if (res == MSG_OK)
return 0;