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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
examples
/
msg
/
masterslave
/
masterslave_forwarder.c
diff --git
a/examples/msg/masterslave/masterslave_forwarder.c
b/examples/msg/masterslave/masterslave_forwarder.c
index
e0bfee0
..
cf66fae
100644
(file)
--- a/
examples/msg/masterslave/masterslave_forwarder.c
+++ b/
examples/msg/masterslave/masterslave_forwarder.c
@@
-1,11
+1,11
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2014
. 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. */
@@
-26,7
+26,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 */
@@
-35,8
+35,8
@@
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_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;
@@
-53,7
+53,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);
@@
-65,7
+65,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]);
@@
-93,7
+93,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 finalize = MSG_task_create("finalize", 0, 0, FINALIZE);
+ m
sg
_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE);
MSG_task_send(finalize, MSG_host_get_name(slaves[i]));
}
MSG_task_send(finalize, MSG_host_get_name(slaves[i]));
}
@@
-106,7
+106,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;
while (1) {
res = MSG_task_receive(&(task),MSG_host_get_name(MSG_host_self()));
_XBT_GNUC_UNUSED int res;
while (1) {
res = MSG_task_receive(&(task),MSG_host_get_name(MSG_host_self()));
@@
-133,11
+133,11
@@
int forwarder(int argc, char *argv[])
{
int i;
int slaves_count;
{
int i;
int slaves_count;
- m_host_t *slaves;
+ m
sg
_host_t *slaves;
{ /* Process organisation */
slaves_count = argc - 1;
{ /* Process organisation */
slaves_count = argc - 1;
- slaves = xbt_new0(m_host_t, slaves_count);
+ slaves = xbt_new0(m
sg
_host_t, slaves_count);
for (i = 1; i < argc; i++) {
slaves[i - 1] = MSG_get_host_by_name(argv[i]);
for (i = 1; i < argc; i++) {
slaves[i - 1] = MSG_get_host_by_name(argv[i]);
@@
-150,7
+150,7
@@
int forwarder(int argc, char *argv[])
i = 0;
while (1) {
i = 0;
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) {
@@
-180,12
+180,11
@@
int forwarder(int argc, char *argv[])
} /* end_of_forwarder */
/** Test function */
} /* end_of_forwarder */
/** 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);
}
@@
-205,7
+204,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) {
@@
-214,7
+213,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;