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
bcb1965
..
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 */
@@
-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;