Dirty hacks again: shot more bullets, it may be a zombie

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

diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index 3aa6073..d0355c9 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);
   }
+  {
+    /* 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);
@@ -97,7 +117,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;
 }
 
@@ -114,23 +134,6 @@ int main(int argc, char *argv[])
     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();