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
reindent
[simgrid.git]
/
examples
/
msg
/
ns3
/
ns3.c
diff --git
a/examples/msg/ns3/ns3.c
b/examples/msg/ns3/ns3.c
index e121a3f2e1f5254aae398155a48e8712c68c6732..4a8b214de66a6ab72d4ad0de911ab77a0dde635f 100644
(file)
--- a/
examples/msg/ns3/ns3.c
+++ b/
examples/msg/ns3/ns3.c
@@
-1,4
+1,4
@@
-/* 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
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-6,7
+6,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "
msg
/msg.h"
+#include "
simgrid
/msg.h"
#include "xbt/log.h"
#include "xbt/asserts.h"
#include "xbt/log.h"
#include "xbt/asserts.h"
@@
-35,7
+35,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; //set as 1 in the master process
const char *application_file);
int timer_start; //set as 1 in the master process
@@
-45,7
+45,7
@@
int timer_start; //set as 1 in the master process
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;
@@
-58,7
+58,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;
@@
-84,13
+84,13
@@
int master(int argc, char *argv[])
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, task_comm_size, NULL);
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, 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;
}
- { /* Process organi
s
ation */
+ { /* Process organi
z
ation */
MSG_get_host_by_name(slavename);
}
MSG_get_host_by_name(slavename);
}
@@
-139,7
+139,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 = MSG_OK;
int id = 0;
char id_alias[10];
int a = MSG_OK;
int id = 0;
char id_alias[10];
@@
-168,8
+168,8
@@
int slave(int argc, char *argv[])
elapsed_time = MSG_get_clock() - start_time;
XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s",
elapsed_time = MSG_get_clock() - start_time;
XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s",
-
id,
-
MSG_task_get_data_size
(task),
+ id,
+
MSG_task_get_bytes_amount
(task),
masternames[id],
slavenames[id]);
// MSG_task_execute(task);
masternames[id],
slavenames[id]);
// MSG_task_execute(task);
@@
-180,13
+180,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", "GTNETS"); */
- /* MSG_config("workstation/model","KCCFLN05"); */
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
{ /* Simulation setting */
MSG_create_environment(platform_file);
}
@@
-207,10
+205,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);
@@
-218,8
+216,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