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
Desactivate an historical MC_assert so that model-checking Chord get a chance to...
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_cluster.c
diff --git
a/examples/msg/masterslave/masterslave_cluster.c
b/examples/msg/masterslave/masterslave_cluster.c
index
6d78433
..
d05ec6a
100644
(file)
--- a/
examples/msg/masterslave/masterslave_cluster.c
+++ b/
examples/msg/masterslave/masterslave_cluster.c
@@
-16,7
+16,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
-
MSG
_error_t test_all(const char *platform_file);
+
msg
_error_t test_all(const char *platform_file);
int master(int argc, char *argv[]);
int master(int argc, char *argv[]);
@@
-26,8
+26,8
@@
int slave(int argc, char *argv[]);
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_task_t *todo = NULL;
+ m
sg
_host_t *slaves = NULL;
+ m
sg
_task_t *todo = 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;
@@
-44,7
+44,7
@@
int master(int argc, char *argv[])
{ /* Task creation */
char sprintf_buffer[64];
{ /* Task creation */
char sprintf_buffer[64];
- todo = xbt_new0(m_task_t, number_of_tasks);
+ todo = xbt_new0(m
sg
_task_t, number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
sprintf(sprintf_buffer, "Task_%d", i);
for (i = 0; i < number_of_tasks; i++) {
sprintf(sprintf_buffer, "Task_%d", i);
@@
-56,7
+56,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]);
@@
-103,7
+103,7
@@
int slave(int argc, char *argv[])
{
XBT_INFO("I'm a slave");
while (1) {
{
XBT_INFO("I'm a slave");
while (1) {
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
int a;
a = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
int a;
a = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
@@
-197,9
+197,9
@@
static int bypass_deployment(void)
}
/** Test function */
}
/** Test function */
-
MSG
_error_t test_all(const char *platform_file)
+
msg
_error_t test_all(const char *platform_file)
{
{
-
MSG
_error_t res = MSG_OK;
+
msg
_error_t res = MSG_OK;
MSG_create_environment(platform_file);
MSG_function_register("master", master);
MSG_function_register("slave", slave);
MSG_create_environment(platform_file);
MSG_function_register("master", master);
MSG_function_register("slave", slave);
@@
-216,11
+216,10
@@
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);
res = test_all(argv[1]);
MSG_init(&argc, argv);
res = test_all(argv[1]);
- MSG_clean();
if (res == MSG_OK)
return 0;
if (res == MSG_OK)
return 0;