Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid into...

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

diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c
index d85e651..bb6d765 100644 (file)
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/tracing/categories.c
@@ -15,8 +15,8 @@
  * --cfg=tracing:1
  * --cfg=tracing/categorized:1
  * --cfg=tracing/uncategorized:1
- * --cfg=triva/categorized:triva_cat.plist
- * --cfg=triva/uncategorized:triva_uncat.plist
+ * --cfg=viva/categorized:viva_cat.plist
+ * --cfg=viva/uncategorized:viva_uncat.plist
  * (See \ref tracing_tracing_options for details)
  */
 
@@ -40,7 +40,7 @@ int master(int argc, char *argv[])
 
   int i;
   for (i = 0; i < number_of_tasks; i++) {
-    m_task_t task = NULL;
+    msg_task_t task = NULL;
 
     //creating task and setting its category
     if (i % 2) {
@@ -57,7 +57,7 @@ int master(int argc, char *argv[])
   }
 
   for (i = 0; i < slaves_count; i++) {
-    m_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
+    msg_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
     MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");
   }
@@ -68,7 +68,7 @@ int master(int argc, char *argv[])
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
 
   while (1) {
     MSG_task_receive(&(task), "master_mailbox");
@@ -109,6 +109,5 @@ int main(int argc, char *argv[])
   MSG_launch_application(deployment_file);
 
   MSG_main();
-  MSG_clean();
   return 0;
 }