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
give all machines the exact same energetic profil, and adapt the tests accordingly
[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
..
ce4eec9
100644
(file)
--- a/
examples/msg/masterslave/masterslave_failure.c
+++ b/
examples/msg/masterslave/masterslave_failure.c
@@
-1,11
+1,11
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <stdio.h>
-#include "
msg/msg.h" /* Yeah! If you want to use msg, you need to include msg
/msg.h */
+#include "
simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid
/msg.h */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
#include "xbt/sysdep.h" /* calloc, printf */
/* Create a log channel to have nice outputs. */
@@
-16,8
+16,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[]);
-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,12
+25,12
@@
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 i;
int number_of_tasks = 0;
double task_comp_size = 0;
double task_comm_size = 0;
int i;
-
_XBT_GNUC
_UNUSED int read;
+
XBT_ATTRIB
_UNUSED int read;
read = sscanf(argv[1], "%d", &number_of_tasks);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
read = sscanf(argv[1], "%d", &number_of_tasks);
xbt_assert(read, "Invalid argument %s\n", argv[1]);
@@
-40,12
+39,12
@@
int master(int argc, char *argv[])
read = sscanf(argv[3], "%lg", &task_comm_size);
xbt_assert(read, "Invalid argument %s\n", argv[3]);
read = sscanf(argv[3], "%lg", &task_comm_size);
xbt_assert(read, "Invalid argument %s\n", argv[3]);
- { /* Process organi
s
ation */
+ { /* Process organi
z
ation */
slaves_count = argc - 4;
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++) {
for (i = 4; i < argc; i++) {
- slaves[i - 4] = MSG_
get_
host_by_name(argv[i]);
+ slaves[i - 4] = MSG_host_by_name(argv[i]);
if (slaves[i - 4] == NULL) {
XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
abort();
if (slaves[i - 4] == NULL) {
XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
abort();
@@
-60,9
+59,9
@@
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));
xbt_new0(double, 1));
-
in
t a;
+
msg_error_
t a;
*((double *) task->data) = MSG_get_clock();
a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0);
*((double *) task->data) = MSG_get_clock();
a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0);
@@
-97,7
+96,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
+130,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;
@@
-156,6
+155,8
@@
int slave(int argc, char *argv[])
} else if (a == MSG_HOST_FAILURE) {
XBT_INFO
("Gloups. The cpu on which I'm running just turned off!. See you!");
} else if (a == MSG_HOST_FAILURE) {
XBT_INFO
("Gloups. The cpu on which I'm running just turned off!. See you!");
+ free(task->data);
+ MSG_task_destroy(task);
return 0;
} else {
XBT_INFO("Hey ?! What's up ? ");
return 0;
} else {
XBT_INFO("Hey ?! What's up ? ");
@@
-177,12
+178,11
@@
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_create_environment(platform_file);
}
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
@@
-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;