X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48a6c50a85f2d0d71990bd4a57d23fb6d763f64a..2eef51f85212214302326508352271ca96de05eb:/examples/msg/gtnets/gtnets.c

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index 11a895ef50..52369804af 100644
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -13,10 +13,15 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+/** @addtogroup MSG_examples
+ * 
+ * - <b>gtnets</b> Simple ping-pong using GTNeTs instead of the SimGrid network models.
+ */
+
 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;
@@ -26,7 +31,7 @@ int timer_start = 1;
 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;
@@ -39,7 +44,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;
@@ -65,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);
-    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;
@@ -112,7 +117,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;
   int id = 0;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
@@ -196,10 +201,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"); */
@@ -223,10 +228,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);
@@ -234,8 +239,6 @@ int main(int argc, char *argv[])
 
   res = test_all(argv[1], argv[2]);
 
-  MSG_clean();
-
   if (res == MSG_OK)
     return 0;
   else