X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/272ccad1b68b6d9c17069f3c934886925bb15b5d..a34aa584ccd2bdb81659d0e5df22864cf999c0f4:/examples/msg/ns3/ns3.c diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c index 81ee74b98a..44e213efc8 100644 --- a/examples/msg/ns3/ns3.c +++ b/examples/msg/ns3/ns3.c @@ -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[]); -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 @@ -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]; -m_task_t gl_task_array[NTASKS]; +msg_task_t gl_task_array[NTASKS]; 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; - m_task_t todo; + msg_task_t todo; char id_alias[10]; //unique id to control statistics int id = -1; @@ -139,7 +139,7 @@ int timer(int argc, char *argv[]) int slave(int argc, char *argv[]) { - m_task_t task = NULL; + msg_task_t task = NULL; int a = MSG_OK; int id = 0; char id_alias[10]; @@ -180,10 +180,10 @@ int slave(int argc, char *argv[]) } /* 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) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; /* MSG_config("workstation/model", "GTNETS"); */ /* MSG_config("workstation/model","KCCFLN05"); */ @@ -207,10 +207,10 @@ MSG_error_t test_all(const char *platform_file, /** Main function */ int main(int argc, char *argv[]) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; 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);