[trace] categories declaration must be after environment creation

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9169 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c
index 8a12f81..b10abcc 100644 (file)
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/tracing/categories.c
@@ -83,6 +83,13 @@ MSG_error_t test_all(const char *platform_file,
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }

+  {
+    //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);
   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);


@@ -107,12 +114,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
     exit(1);
   }
 

-  //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();
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
 

diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index 3aa6073..3c35c82 100644 (file)
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -90,6 +90,26 @@ MSG_error_t test_all(const char *platform_file,
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }

+  {
+    /* declaring tracing categories */
+
+    //declaring user variables
+    TRACE_host_variable_declare("is_slave");
+    TRACE_host_variable_declare("is_master");
+    TRACE_host_variable_declare("task_creation");
+    TRACE_host_variable_declare("task_computation");
+
+    //declaring user markers
+    TRACE_declare_mark("msmark");
+
+    //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);
+  }

   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);


@@ -114,23 +134,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
     exit(1);
   }
 

-  //declaring user variables
-  TRACE_host_variable_declare("is_slave");
-  TRACE_host_variable_declare("is_master");
-  TRACE_host_variable_declare("task_creation");
-  TRACE_host_variable_declare("task_computation");
-
-  //declaring user markers
-  TRACE_declare_mark("msmark");
-
-  //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();
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
 

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index edd2945..e43c83c 100644 (file)
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -50,11 +50,13 @@ int main(int argc, char *argv[])
               argv[0]);
     exit(1);
   }
               argv[0]);
     exit(1);
   }

-  TRACE_category_with_color ("emigrant", "1 0 0");

 
   /* Simulation setting */
   MSG_create_environment(argv[1]);
 
 
   /* Simulation setting */
   MSG_create_environment(argv[1]);
 

+  /* declaring tracing category for the process (after environment creation) */
+  TRACE_category_with_color ("emigrant", "1 0 0");
+

   /* Application deployment */
   MSG_function_register("emigrant", emigrant);
   MSG_launch_application(argv[2]);
   /* Application deployment */
   MSG_function_register("emigrant", emigrant);
   MSG_launch_application(argv[2]);

diff --git a/examples/msg/tracing/tasks.c b/examples/msg/tracing/tasks.c
index 827d258..0caac72 100644 (file)
--- a/examples/msg/tracing/tasks.c
+++ b/examples/msg/tracing/tasks.c
@@ -87,6 +87,11 @@ MSG_error_t test_all(const char *platform_file,
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }
     MSG_set_channel_number(0);
     MSG_create_environment(platform_file);
   }

+  {
+    //declaring user categories
+    TRACE_category_with_color ("compute", "1 0 0");  //compute is red
+    TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
+  }

   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);


@@ -111,10 +116,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
     exit(1);
   }
 

-  //declaring user categories
-  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();
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
 

diff --git a/examples/msg/tracing/volume.c b/examples/msg/tracing/volume.c
index b35e651..673d3d4 100644 (file)
--- a/examples/msg/tracing/volume.c
+++ b/examples/msg/tracing/volume.c
@@ -90,6 +90,22 @@ MSG_error_t test_all(const char *platform_file,
     MSG_set_channel_number(0);
     MSG_create_environment(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
+
+    //declaring user categories (for processes)
+    TRACE_category_with_color ("master", "1 0 0");
+    TRACE_category_with_color ("slave", "0 0 1");
+  }

   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);


@@ -113,20 +129,6 @@ int main(int argc, char *argv[])
     printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
     exit(1);
   }
     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_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_with_color ("master", "1 0 0");
-  TRACE_category_with_color ("slave", "0 0 1");

 
   res = test_all(argv[1], argv[2]);
   MSG_clean();
 
   res = test_all(argv[1], argv[2]);
   MSG_clean();