From 6defb5e855de0347744d25aeda96dab73f44363e Mon Sep 17 00:00:00 2001
From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 6 Dec 2010 00:55:52 +0000
Subject: [PATCH] [trace] categories may have colors registered in the trace
 file

details:
- specify color randomly if no color is provided

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8988 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/msg/tracing/categories.c | 10 +++++-----
 examples/msg/tracing/ms.c         | 10 +++++++---
 examples/msg/tracing/procmig.c    |  2 +-
 examples/msg/tracing/tasks.c      |  4 ++--
 examples/msg/tracing/volume.c     | 12 ++++++------
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c
index 07d03f6218..8a12f8106f 100644
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/tracing/categories.c
@@ -107,11 +107,11 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  //declaring user categories
-  TRACE_category("compute");
-  TRACE_category("request");
-  TRACE_category("data");
-  TRACE_category("finalize");
+  //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
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index 179e1c5fcf..3aa6073f23 100644
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -123,9 +123,13 @@ int main(int argc, char *argv[])
   //declaring user markers
   TRACE_declare_mark("msmark");
 
-  //declaring user categories
-  TRACE_category("compute");
-  TRACE_category("finalize");
+  //declaring user categories with RGB colors (values from 0 to 1)
+  TRACE_category_with_color ("compute", "1 0 0");  //compute is red
+  TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
+  //categories without user-defined colors receive
+  //random colors generated by the tracing system
+  TRACE_category ("request");
+  TRACE_category_with_color ("report", NULL);
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index 2a22680368..edd2945ee3 100644
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
               argv[0]);
     exit(1);
   }
-  TRACE_category("emigrant");
+  TRACE_category_with_color ("emigrant", "1 0 0");
 
   /* Simulation setting */
   MSG_create_environment(argv[1]);
diff --git a/examples/msg/tracing/tasks.c b/examples/msg/tracing/tasks.c
index 8cac0f8086..827d25840c 100644
--- a/examples/msg/tracing/tasks.c
+++ b/examples/msg/tracing/tasks.c
@@ -112,8 +112,8 @@ int main(int argc, char *argv[])
   }
 
   //declaring user categories
-  TRACE_category("compute");
-  TRACE_category("finalize");
+  TRACE_category_with_color ("compute", "1 0 0");  //compute is red
+  TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
diff --git a/examples/msg/tracing/volume.c b/examples/msg/tracing/volume.c
index da850697a4..b35e651f21 100644
--- a/examples/msg/tracing/volume.c
+++ b/examples/msg/tracing/volume.c
@@ -119,14 +119,14 @@ int main(int argc, char *argv[])
   //     - the tasks sent have a category
 
   //declaring user categories (for tasks)
-  TRACE_category("compute");
-  TRACE_category("request");
-  TRACE_category("data");
-  TRACE_category("finalize");
+  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
 
   //declaring user categories (for processes)
-  TRACE_category("master");
-  TRACE_category("slave");
+  TRACE_category_with_color ("master", "1 0 0");
+  TRACE_category_with_color ("slave", "0 0 1");
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
-- 
2.20.1