X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7fbf71906af4c8cf4aa7d743e5db57a72b6b5ac..194eced51d57295aec41905adadda8e9b21f74b9:/examples/msg/tracing/ms.c

diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index f9d203d422..69fe71b72f 100644
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -41,16 +41,16 @@ 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(MSG_host_self()->name, "is_master", 1);
+  TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_master", 1);
 
   TRACE_mark("msmark", "start_send_tasks");
   int i;
   for (i = 0; i < number_of_tasks; i++) {
-    m_task_t task = NULL;
+    msg_task_t task = NULL;
     task = MSG_task_create("task", task_comp_size, task_comm_size, NULL);
 
     //setting the variable "task_creation" to value i
-    TRACE_host_variable_set(MSG_host_self()->name, "task_creation", i);
+    TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "task_creation", i);
 
     //setting the category of task to "compute"
     //the category of a task must be defined before it is sent or executed
@@ -60,7 +60,7 @@ int master(int argc, char *argv[])
   TRACE_mark("msmark", "finish_send_tasks");
 
   for (i = 0; i < slaves_count; i++) {
-    m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
+    msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
     MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");
   }
@@ -71,9 +71,12 @@ int master(int argc, char *argv[])
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
-  m_task_t task = NULL;
+  msg_task_t task = NULL;
 
-  TRACE_host_variable_set(MSG_host_self()->name, "is_slave", 1);
+  TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_slave", 1);
+  TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()),
+                          "task_computation",
+                          0);
   while (1) {
     MSG_task_receive(&(task), "master_mailbox");
 
@@ -83,7 +86,7 @@ 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(MSG_host_self()->name,
+    TRACE_host_variable_add(MSG_host_get_name(MSG_host_self()),
                             "task_computation",
                             MSG_task_get_compute_duration(task));
     MSG_task_execute(task);
@@ -96,7 +99,7 @@ int slave(int argc, char *argv[])
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     exit(1);
@@ -112,8 +115,10 @@ int main(int argc, char *argv[])
   TRACE_host_variable_declare("task_creation");
   TRACE_host_variable_declare("task_computation");
 
-  //declaring user markers
+  //declaring user markers and values
   TRACE_declare_mark("msmark");
+  TRACE_declare_mark_value ("msmark", "start_send_tasks");
+  TRACE_declare_mark_value ("msmark", "finish_send_tasks");
 
   //declaring user categories with RGB colors (values from 0 to 1)
   TRACE_category_with_color ("compute", "1 0 0");  //compute is red
@@ -129,25 +134,26 @@ int main(int argc, char *argv[])
 
   MSG_main();
 
-  XBT_INFO ("Declared tracing categories:");
-  xbt_dynar_t categories = TRACE_get_categories ();
   unsigned int cursor;
-  char *category;
-  xbt_dynar_foreach (categories, cursor, category){
-    XBT_INFO ("%s", category);
+  xbt_dynar_t categories = TRACE_get_categories ();
+  if (categories){
+    XBT_INFO ("Declared tracing categories:");
+    char *category;
+    xbt_dynar_foreach (categories, cursor, category){
+      XBT_INFO ("%s", category);
+    }
+    xbt_dynar_free (&categories);
   }
-  xbt_dynar_free (&categories);
 
-  XBT_INFO ("Declared marks:");
   xbt_dynar_t marks = TRACE_get_marks ();
-  char *mark;
-  xbt_dynar_foreach (marks, cursor, mark){
-    XBT_INFO ("%s", mark);
+  if (marks){
+    XBT_INFO ("Declared marks:");
+    char *mark;
+    xbt_dynar_foreach (marks, cursor, mark){
+      XBT_INFO ("%s", mark);
+    }
+    xbt_dynar_free (&marks);
   }
-  xbt_dynar_free (&marks);
-
-
 
-  MSG_clean();
   return 0;
 }                               /* end_of_main */