Use new style logging macros.

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

diff --git a/examples/msg/tracing/volume.c b/examples/msg/tracing/volume.c
index da85069..c19720a 100644 (file)
--- a/examples/msg/tracing/volume.c
+++ b/examples/msg/tracing/volume.c
@@ -23,9 +23,6 @@ MSG_error_t test_all(const char *platform_file,
 /** Emitter function  */
 int master(int argc, char *argv[])
 {
-  //defining the category of the master process
-  TRACE_msg_set_process_category(MSG_process_self(), "master");
-
   long number_of_tasks = atol(argv[1]);
   long slaves_count = atol(argv[4]);
   int p = 1000000000;
@@ -59,9 +56,6 @@ int master(int argc, char *argv[])
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
-  //defining the category of this slave process
-  TRACE_msg_set_process_category(MSG_process_self(), "slave");
-
   m_task_t task = NULL;
   int res;
 
@@ -90,6 +84,18 @@ MSG_error_t test_all(const char *platform_file,
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
+  {
+    //--cfg=tracing/msg/volume
+    // - the communication volume among processes expects that:
+    //     - the processes involved have a category
+    //     - the sent tasks have a category
+
+    //declaring user categories (for tasks)
+    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);
@@ -97,7 +103,7 @@ MSG_error_t test_all(const char *platform_file,
   }
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }
 
@@ -113,20 +119,6 @@ int main(int argc, char *argv[])
     printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
     exit(1);
   }
-  //starting the simulation tracing with the TRACE_VOLUME mask
-  // - the communication volume among processes expects that:
-  //     - the processes involved have a category
-  //     - the tasks sent have a category
-
-  //declaring user categories (for tasks)
-  TRACE_category("compute");
-  TRACE_category("request");
-  TRACE_category("data");
-  TRACE_category("finalize");
-
-  //declaring user categories (for processes)
-  TRACE_category("master");
-  TRACE_category("slave");
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();