X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6defb5e855de0347744d25aeda96dab73f44363e..7b98df0790cc3fec26293ba257f64d94135098c4:/examples/msg/tracing/ms.c

diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index 3aa6073f23..80733456cf 100644
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -28,7 +28,7 @@ int master(int argc, char *argv[])
   long slaves_count = atol(argv[4]);
 
   //setting the variable "is_master" (previously declared) to value 1
-  TRACE_host_variable_set("is_master", 1);
+  TRACE_host_variable_set(MSG_host_self()->name, "is_master", 1);
 
   TRACE_mark("msmark", "start_send_tasks");
   int i;
@@ -37,7 +37,7 @@ int master(int argc, char *argv[])
     task = MSG_task_create("task", task_comp_size, task_comm_size, NULL);
 
     //setting the variable "task_creation" to value i
-    TRACE_host_variable_set("task_creation", i);
+    TRACE_host_variable_set(MSG_host_self()->name, "task_creation", i);
 
     //setting the category of task to "compute"
     //the category of a task must be defined before it is sent or executed
@@ -59,11 +59,10 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
 
-  TRACE_host_variable_set("is_slave", 1);
+  TRACE_host_variable_set(MSG_host_self()->name, "is_slave", 1);
   while (1) {
-    res = MSG_task_receive(&(task), "master_mailbox");
+    MSG_task_receive(&(task), "master_mailbox");
 
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
       MSG_task_destroy(task);
@@ -71,7 +70,8 @@ int slave(int argc, char *argv[])
     }
     //adding the value returned by MSG_task_get_compute_duration(task)
     //to the variable "task_computation"
-    TRACE_host_variable_add("task_computation",
+    TRACE_host_variable_add(MSG_host_self()->name,
+                            "task_computation",
                             MSG_task_get_compute_duration(task));
     MSG_task_execute(task);
     MSG_task_destroy(task);
@@ -87,9 +87,28 @@ MSG_error_t test_all(const char *platform_file,
   MSG_error_t res = MSG_OK;
 
   {                             /*  Simulation setting */
-    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 +116,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 +133,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();