X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0821eaf865ee5431f938481ede3c2e77ef095f65..ded5bf36fae30e458d8f8e225832ec7d8d88ee34:/examples/msg/ns3/ns3.c

diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c
index e121a3f2e1..d1ffeee73c 100644
--- 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-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -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;
@@ -84,7 +84,7 @@ 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);
-    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;
@@ -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];
@@ -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",
-		  id,
-		  MSG_task_get_data_size(task),
+      id,
+      MSG_task_get_data_size(task),
        masternames[id],
        slavenames[id]);
 //  MSG_task_execute(task);
@@ -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);
@@ -218,8 +218,6 @@ int main(int argc, char *argv[])
 
   res = test_all(argv[1], argv[2]);
 
-  MSG_clean();
-
   if (res == MSG_OK)
     return 0;
   else