X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/662ca0e49048d7aeadbd4f4b028cb0721a1d2a78..7925dfbd28b2cd822b05c21b81ca6a3facaa14d1:/examples/msg/tracing/ms.c

diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index a14f913596..155b822c53 100644
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -4,6 +4,21 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+/** @addtogroup MSG_examples
+ * 
+ * - <b>tracing/ms.c</b> This is a master/slave program where the master creates
+ * tasks, send them to the slaves. For each task received, the slave executes
+ * it and then destroys it. This program uses several tracing functions that
+ * enable the tracing of categorized resource utilization, the use of trace marks,
+ * and user variables associated to the hosts of the platform file.
+ * You might want to run this program with the following parameters:
+ * --cfg=tracing/categorized:1
+ * --cfg=tracing/uncategorized:1
+ * --cfg=triva/categorized:triva_cat.plist
+ * --cfg=triva/uncategorized:triva_uncat.plist
+ * (See \ref tracing_tracing_options for details)
+ */
+
 #include <stdio.h>
 #include "msg/msg.h"
 #include "xbt/sysdep.h"         /* calloc, printf */
@@ -14,6 +29,9 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+int master(int argc, char *argv[]);
+int slave(int argc, char *argv[]);
+
 /** Emitter function  */
 int master(int argc, char *argv[])
 {
@@ -36,14 +54,14 @@ int master(int argc, char *argv[])
 
     //setting the category of task to "compute"
     //the category of a task must be defined before it is sent or executed
-    TRACE_msg_set_task_category(task, "compute");
+    MSG_task_set_category(task, "compute");
     MSG_task_send(task, "master_mailbox");
   }
   TRACE_mark("msmark", "finish_send_tasks");
 
   for (i = 0; i < slaves_count; i++) {
     m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
-    TRACE_msg_set_task_category(finalize, "finalize");
+    MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");
   }
 
@@ -78,8 +96,6 @@ int slave(int argc, char *argv[])
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
-
   MSG_global_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
@@ -112,6 +128,16 @@ int main(int argc, char *argv[])
   MSG_launch_application(deployment_file);
 
   MSG_main();
+
+  XBT_INFO ("Declared tracing categories:");
+  xbt_dynar_t categories = TRACE_get_categories ();
+  unsigned int cursor;
+  char *category;
+  xbt_dynar_foreach (categories, cursor, category){
+    XBT_INFO ("%s", category);
+  }
+  xbt_dynar_free (&categories);
+
   MSG_clean();
   return 0;
 }                               /* end_of_main */