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
move an example from teshsuite to examples
[simgrid.git]
/
examples
/
msg
/
process-join
/
process-join.c
diff --git
a/teshsuite/msg/process_join/process_join.c
b/examples/msg/process-join/process-join.c
similarity index 80%
rename from
teshsuite/msg/process_join/process_join.c
rename to
examples/msg/process-join/process-join.c
index
a19aa05
..
282c342
100644
(file)
--- a/
teshsuite/msg/process_join/process_join.c
+++ b/
examples/msg/process-join/process-join.c
@@
-8,7
+8,7
@@
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");
-static int slave(int argc, char
*
argv[])
+static int slave(int argc, char
*
argv[])
{
XBT_INFO("Slave started");
MSG_process_sleep(3);
{
XBT_INFO("Slave started");
MSG_process_sleep(3);
@@
-16,22
+16,22
@@
static int slave(int argc, char *argv[])
return 0;
}
return 0;
}
-static int master(int argc, char
*
argv[])
+static int master(int argc, char
*
argv[])
{
msg_process_t process;
XBT_INFO("Start slave");
{
msg_process_t process;
XBT_INFO("Start slave");
- process =
MSG_process_create("slave from master", slave, NULL, MSG_host_self());
+ process = MSG_process_create("slave from master", slave, NULL, MSG_host_self());
XBT_INFO("Join the slave (timeout 2)");
MSG_process_join(process, 2);
XBT_INFO("Start slave");
XBT_INFO("Join the slave (timeout 2)");
MSG_process_join(process, 2);
XBT_INFO("Start slave");
- process =
MSG_process_create("slave from master", slave, NULL, MSG_host_self());
+ process = MSG_process_create("slave from master", slave, NULL, MSG_host_self());
XBT_INFO("Join the slave (timeout 4)");
MSG_process_join(process, 4);
XBT_INFO("Start slave");
XBT_INFO("Join the slave (timeout 4)");
MSG_process_join(process, 4);
XBT_INFO("Start slave");
- process =
MSG_process_create("slave from master", slave, NULL, MSG_host_self());
+ process = MSG_process_create("slave from master", slave, NULL, MSG_host_self());
XBT_INFO("Join the slave (timeout 2)");
MSG_process_join(process, 2);
XBT_INFO("Join the slave (timeout 2)");
MSG_process_join(process, 2);
@@
-50,7
+50,7
@@
static int master(int argc, char *argv[])
return 0;
}
return 0;
}
-int main(int argc, char
*
argv[])
+int main(int argc, char
*
argv[])
{
msg_error_t res;
{
msg_error_t res;