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 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_failure.c
diff --git
a/examples/msg/masterslave/masterslave_failure.c
b/examples/msg/masterslave/masterslave_failure.c
index
c567f4c
..
6a4f5e3
100644
(file)
--- a/
examples/msg/masterslave/masterslave_failure.c
+++ b/
examples/msg/masterslave/masterslave_failure.c
@@
-17,7
+17,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
int forwarder(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,
+
msg
_error_t test_all(const char *platform_file,
const char *application_file);
#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
const char *application_file);
#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
@@
-26,7
+26,7
@@
MSG_error_t test_all(const char *platform_file,
int master(int argc, char *argv[])
{
int slaves_count = 0;
int master(int argc, char *argv[])
{
int slaves_count = 0;
- m_host_t *slaves = NULL;
+ m
sg
_host_t *slaves = NULL;
int number_of_tasks = 0;
double task_comp_size = 0;
double task_comm_size = 0;
int number_of_tasks = 0;
double task_comp_size = 0;
double task_comm_size = 0;
@@
-42,7
+42,7
@@
int master(int argc, char *argv[])
{ /* Process organisation */
slaves_count = argc - 4;
{ /* Process organisation */
slaves_count = argc - 4;
- slaves = xbt_new0(m_host_t, slaves_count);
+ slaves = xbt_new0(m
sg
_host_t, slaves_count);
for (i = 4; i < argc; i++) {
slaves[i - 4] = MSG_get_host_by_name(argv[i]);
for (i = 4; i < argc; i++) {
slaves[i - 4] = MSG_get_host_by_name(argv[i]);
@@
-60,7
+60,7
@@
int master(int argc, char *argv[])
XBT_INFO("Got %d task to process :", number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
XBT_INFO("Got %d task to process :", number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
- m_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size,
+ m
sg
_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size,
xbt_new0(double, 1));
int a;
*((double *) task->data) = MSG_get_clock();
xbt_new0(double, 1));
int a;
*((double *) task->data) = MSG_get_clock();
@@
-97,7
+97,7
@@
int master(int argc, char *argv[])
XBT_INFO
("All tasks have been dispatched. Let's tell everybody the computation is over.");
for (i = 0; i < slaves_count; i++) {
XBT_INFO
("All tasks have been dispatched. Let's tell everybody the computation is over.");
for (i = 0; i < slaves_count; i++) {
- m_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE);
+ m
sg
_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE);
int a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i]),1.0);
if (a == MSG_OK)
continue;
int a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i]),1.0);
if (a == MSG_OK)
continue;
@@
-131,7
+131,7
@@
int master(int argc, char *argv[])
int slave(int argc, char *argv[])
{
while (1) {
int slave(int argc, char *argv[])
{
while (1) {
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
int a;
double time1, time2;
int a;
double time1, time2;
@@
-177,10
+177,10
@@
int slave(int argc, char *argv[])
} /* end_of_slave */
/** Test function */
} /* end_of_slave */
/** 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 */
@@
-201,7
+201,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) {
@@
-210,7
+210,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;