Chord: update some messages displayed

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

diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c
index e84e9dd..400de0a 100644 (file)
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/tracing/categories.c
@@ -6,16 +6,18 @@
 
 #include <stdio.h>
 #include "msg/msg.h"
-#include "xbt/sysdep.h" /* calloc, printf */
+#include "xbt/sysdep.h"         /* calloc, printf */
 
 /* Create a log channel to have nice outputs. */
 #include "xbt/log.h"
 #include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
+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[]);
-MSG_error_t test_all(const char *platform_file, const char *application_file);
+MSG_error_t test_all(const char *platform_file,
+                     const char *application_file);
 
 /** Emitter function  */
 int master(int argc, char *argv[])
@@ -28,25 +30,25 @@ int master(int argc, char *argv[])
     m_task_t task = NULL;
 
     //creating task and setting its category
-    if (i%2){
-      task = MSG_task_create ("task_compute", 10000000, 0, NULL);
-      TRACE_msg_set_task_category (task, "compute");
-    }else if (i%3){
-      task = MSG_task_create ("task_request", 10, 10, NULL);
-      TRACE_msg_set_task_category (task, "request");
-    }else{
-      task = MSG_task_create ("task_data", 10, 10000000, NULL);
-      TRACE_msg_set_task_category (task, "data");
+    if (i % 2) {
+      task = MSG_task_create("task_compute", 10000000, 0, NULL);
+      TRACE_msg_set_task_category(task, "compute");
+    } else if (i % 3) {
+      task = MSG_task_create("task_request", 10, 10, NULL);
+      TRACE_msg_set_task_category(task, "request");
+    } else {
+      task = MSG_task_create("task_data", 10, 10000000, NULL);
+      TRACE_msg_set_task_category(task, "data");
     }
     MSG_task_send(task, "master_mailbox");
   }
-  
-   for (i = 0; i < slaves_count; i++) { 
-     m_task_t finalize = MSG_task_create ("finalize", 0, 1000, 0);
-     TRACE_msg_set_task_category(finalize, "finalize");
-     MSG_task_send(finalize, "master_mailbox");
-   } 
-  
+
+  for (i = 0; i < slaves_count; i++) {
+    m_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
+    TRACE_msg_set_task_category(finalize, "finalize");
+    MSG_task_send(finalize, "master_mailbox");
+  }
+
   return 0;
 }
 
@@ -56,12 +58,12 @@ int slave(int argc, char *argv[])
   m_task_t task = NULL;
   int res;
 
-  while(1) {
+  while (1) {
     res = MSG_task_receive(&(task), "master_mailbox");
 
-    if (!strcmp(MSG_task_get_name(task),"finalize")) {
+    if (!strcmp(MSG_task_get_name(task), "finalize")) {
       MSG_task_destroy(task);
-       break;
+      break;
     }
 
     MSG_task_execute(task);
@@ -73,22 +75,29 @@ int slave(int argc, char *argv[])
 
 /** Test function */
 MSG_error_t test_all(const char *platform_file,
-                           const char *application_file)
+                     const char *application_file)
 {
   MSG_error_t res = MSG_OK;
 
-  {                            /*  Simulation setting */
+  {                             /*  Simulation setting */
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
-  {                            /*   Application deployment */
+  {
+    //declaring user categories with RGB colors
+    TRACE_category_with_color ("compute", "1 0 0"); //red
+    TRACE_category_with_color ("request", "0 1 0"); //green
+    TRACE_category_with_color ("data", "0 0 1");    //blue
+    TRACE_category_with_color ("finalize", "0 0 0");//black
+  }
+  {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
     MSG_launch_application(application_file);
   }
   res = MSG_main();
-  
-  INFO1("Simulation time %g",MSG_get_clock());
+
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }
 
@@ -98,30 +107,18 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  MSG_global_init(&argc,argv);
+  MSG_global_init(&argc, argv);
   if (argc < 3) {
-     printf ("Usage: %s platform_file deployment_file\n",argv[0]);
-     printf ("example: %s msg_platform.xml msg_deployment.xml\n",argv[0]);
-     exit(1);
+    printf("Usage: %s platform_file deployment_file\n", argv[0]);
+    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
+    exit(1);
   }
 
-  //starting the simulation tracing
-  TRACE_start ();
-
-  //declaring user categories
-  TRACE_category ("compute");
-  TRACE_category ("request");
-  TRACE_category ("data");
-  TRACE_category ("finalize");
-
-  res = test_all(argv[1],argv[2]);
+  res = test_all(argv[1], argv[2]);
   MSG_clean();
 
-  //ending the simulation tracing
-  TRACE_end();
-
-  if(res==MSG_OK)
+  if (res == MSG_OK)
     return 0;
   else
     return 1;
-} /* end_of_main */
+}                               /* end_of_main */