[trace] pay attention to the return value of get functions, they might be null

[simgrid.git] / examples / msg / tracing / ms.c

diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index df58acd..95b3a28 100644 (file)
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -6,7 +6,17 @@
 
 /** @addtogroup MSG_examples
  * 
- * - <b>tracing/ms.c</b> TODO
+ * - <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>
@@ -44,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");
   }
 
@@ -118,6 +128,28 @@ int main(int argc, char *argv[])
   MSG_launch_application(deployment_file);
 
   MSG_main();
+
+  unsigned int cursor;
+  xbt_dynar_t categories = TRACE_get_categories ();
+  if (categories){
+    XBT_INFO ("Declared tracing categories:");
+    char *category;
+    xbt_dynar_foreach (categories, cursor, category){
+      XBT_INFO ("%s", category);
+    }
+    xbt_dynar_free (&categories);
+  }
+
+  xbt_dynar_t marks = TRACE_get_marks ();
+  if (marks){
+    XBT_INFO ("Declared marks:");
+    char *mark;
+    xbt_dynar_foreach (marks, cursor, mark){
+      XBT_INFO ("%s", mark);
+    }
+    xbt_dynar_free (&marks);
+  }
+
   MSG_clean();
   return 0;
 }                               /* end_of_main */