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
disable optimizations for build MC in jenkins
[simgrid.git]
/
examples
/
msg
/
gtnets
/
gtnets.c
diff --git
a/examples/msg/gtnets/gtnets.c
b/examples/msg/gtnets/gtnets.c
index
003672f
..
5236980
100644
(file)
--- a/
examples/msg/gtnets/gtnets.c
+++ b/
examples/msg/gtnets/gtnets.c
@@
-21,7
+21,7
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
int timer(int argc, char *argv[]);
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
int timer(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);
int timer_start = 1;
const char *application_file);
int timer_start = 1;
@@
-31,7
+31,7
@@
int timer_start = 1;
int bool_printed = 0;
double start_time, end_time, elapsed_time;
double gl_data_size[NTASKS];
int bool_printed = 0;
double start_time, end_time, elapsed_time;
double gl_data_size[NTASKS];
-m_task_t gl_task_array[NTASKS];
+m
sg
_task_t gl_task_array[NTASKS];
const char *slavenames[NTASKS];
const char *masternames[NTASKS];
int gl_task_array_id = 0;
const char *slavenames[NTASKS];
const char *masternames[NTASKS];
int gl_task_array_id = 0;
@@
-44,7
+44,7
@@
int master(int argc, char *argv[])
{
char *slavename = NULL;
double task_comm_size = 0;
{
char *slavename = NULL;
double task_comm_size = 0;
- m_task_t todo;
+ m
sg
_task_t todo;
char id_alias[10];
//unique id to control statistics
int id = -1;
char id_alias[10];
//unique id to control statistics
int id = -1;
@@
-70,7
+70,7
@@
int master(int argc, char *argv[])
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
-
TRACE_msg_set_task
_category(todo, id_alias);
+
MSG_task_set
_category(todo, id_alias);
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
@@
-117,7
+117,7
@@
int timer(int argc, char *argv[])
int slave(int argc, char *argv[])
{
int slave(int argc, char *argv[])
{
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
int a;
int id = 0;
#ifdef HAVE_LATENCY_BOUND_TRACKING
int a;
int id = 0;
#ifdef HAVE_LATENCY_BOUND_TRACKING
@@
-201,10
+201,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", "GTNETS"); */
/* MSG_config("workstation/model","KCCFLN05"); */
/* MSG_config("workstation/model", "GTNETS"); */
/* MSG_config("workstation/model","KCCFLN05"); */
@@
-228,10
+228,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;
bool_printed = 0;
bool_printed = 0;
- MSG_
global_
init(&argc, argv);
+ MSG_init(&argc, argv);
if (argc < 3) {
printf("Usage: %s platform_file deployment_file\n", argv[0]);
exit(1);
if (argc < 3) {
printf("Usage: %s platform_file deployment_file\n", argv[0]);
exit(1);
@@
-239,8
+239,6
@@
int main(int argc, char *argv[])
res = test_all(argv[1], argv[2]);
res = test_all(argv[1], argv[2]);
- MSG_clean();
-
if (res == MSG_OK)
return 0;
else
if (res == MSG_OK)
return 0;
else