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

diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index d0355c9854..95b3a28dc3 100644
--- a/examples/msg/tracing/ms.c
+++ b/examples/msg/tracing/ms.c
@@ -4,6 +4,21 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+/** @addtogroup MSG_examples
+ * 
+ * - <b>tracing/ms.c</b> This is a master/slave program where the master creates
+ * tasks, send them to the slaves. For each task received, the slave executes
+ * it and then destroys it. This program uses several tracing functions that
+ * enable the tracing of categorized resource utilization, the use of trace marks,
+ * and user variables associated to the hosts of the platform file.
+ * You might want to run this program with the following parameters:
+ * --cfg=tracing/categorized:1
+ * --cfg=tracing/uncategorized:1
+ * --cfg=triva/categorized:triva_cat.plist
+ * --cfg=triva/uncategorized:triva_uncat.plist
+ * (See \ref tracing_tracing_options for details)
+ */
+
 #include <stdio.h>
 #include "msg/msg.h"
 #include "xbt/sysdep.h"         /* calloc, printf */
@@ -16,8 +31,6 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
-MSG_error_t test_all(const char *platform_file,
-                     const char *application_file);
 
 /** Emitter function  */
 int master(int argc, char *argv[])
@@ -28,7 +41,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,18 +50,18 @@ 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
-    TRACE_msg_set_task_category(task, "compute");
+    MSG_task_set_category(task, "compute");
     MSG_task_send(task, "master_mailbox");
   }
   TRACE_mark("msmark", "finish_send_tasks");
 
   for (i = 0; i < slaves_count; i++) {
     m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
-    TRACE_msg_set_task_category(finalize, "finalize");
+    MSG_task_set_category(finalize, "finalize");
     MSG_task_send(finalize, "master_mailbox");
   }
 
@@ -59,11 +72,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 +83,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);
@@ -80,65 +93,63 @@ int slave(int argc, char *argv[])
   return 0;
 }
 
-/** Test function */
-MSG_error_t test_all(const char *platform_file,
-                     const char *application_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);
-    MSG_launch_application(application_file);
-  }
-  res = MSG_main();
-
-  XBT_INFO("Simulation time %g", MSG_get_clock());
-  return res;
-}
-
-
 /** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_error_t res = MSG_OK;
-
   MSG_global_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);
     exit(1);
   }
 
-  res = test_all(argv[1], argv[2]);
-  MSG_clean();
+  char *platform_file = argv[1];
+  char *deployment_file = argv[2];
+  MSG_create_environment(platform_file);
+
+  //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);
+
+  MSG_function_register("master", master);
+  MSG_function_register("slave", slave);
+  MSG_launch_application(deployment_file);
+
+  MSG_main();
+
+  unsigned int cursor;
+  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);
+  }
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
+  xbt_dynar_t marks = TRACE_get_marks ();
+  if (marks){
+    XBT_INFO ("Declared marks:");
+    char *mark;
+    xbt_dynar_foreach (marks, cursor, mark){
+      XBT_INFO ("%s", mark);
+    }
+    xbt_dynar_free (&marks);
+  }
+
+  MSG_clean();
+  return 0;
 }                               /* end_of_main */