[trace] update of msg process tracing (to monitor migrations)

details:
- interface to attribute a category to a msg process changed (color needed)
- procmig and volume examples updated

todo:
- states of the processes are not registered

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

diff --git a/examples/msg/tracing/procmig.c b/examples/msg/tracing/procmig.c
index e43c83c..0591adc 100644 (file)
--- a/examples/msg/tracing/procmig.c
+++ b/examples/msg/tracing/procmig.c
@@ -17,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 static int emigrant(int argc, char *argv[])
 {
   INFO0("Setting process category");
 static int emigrant(int argc, char *argv[])
 {
   INFO0("Setting process category");

-  TRACE_msg_set_process_category(MSG_process_self(), "emigrant");
+  TRACE_msg_set_process_category(MSG_process_self(), "emigrant", "1 0 0");

   MSG_process_sleep(2);
   INFO0("Migrating to Tremblay");
   MSG_process_change_host(MSG_get_host_by_name("Tremblay"));
   MSG_process_sleep(2);
   INFO0("Migrating to Tremblay");
   MSG_process_change_host(MSG_get_host_by_name("Tremblay"));


@@ -54,9 +54,6 @@ int main(int argc, char *argv[])
   /* 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/volume.c b/examples/msg/tracing/volume.c
index 673d3d4..2e1bee7 100644 (file)
--- a/examples/msg/tracing/volume.c
+++ b/examples/msg/tracing/volume.c
@@ -24,7 +24,7 @@ MSG_error_t test_all(const char *platform_file,
 int master(int argc, char *argv[])
 {
   //defining the category of the master process
 int master(int argc, char *argv[])
 {
   //defining the category of the master process

-  TRACE_msg_set_process_category(MSG_process_self(), "master");
+  TRACE_msg_set_process_category(MSG_process_self(), "master", "1 0 0");

 
   long number_of_tasks = atol(argv[1]);
   long slaves_count = atol(argv[4]);
 
   long number_of_tasks = atol(argv[1]);
   long slaves_count = atol(argv[4]);


@@ -60,7 +60,7 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   //defining the category of this slave process
 int slave(int argc, char *argv[])
 {
   //defining the category of this slave process

-  TRACE_msg_set_process_category(MSG_process_self(), "slave");
+  TRACE_msg_set_process_category(MSG_process_self(), "slave", "0 0 1");

 
   m_task_t task = NULL;
   int res;
 
   m_task_t task = NULL;
   int res;


@@ -101,10 +101,6 @@ MSG_error_t test_all(const char *platform_file,
     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
     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);
   }
   {                             /*   Application deployment */
     MSG_function_register("master", master);

diff --git a/include/instr/instr.h b/include/instr/instr.h
index ae16994..156a684 100644 (file)
--- a/include/instr/instr.h
+++ b/include/instr/instr.h
@@ -19,8 +19,7 @@ XBT_PUBLIC(void) TRACE_category(const char *category);
 XBT_PUBLIC(void) TRACE_category_with_color (const char *category, const char *color);
 XBT_PUBLIC(void) TRACE_msg_set_task_category(m_task_t task,
                                              const char *category);
 XBT_PUBLIC(void) TRACE_category_with_color (const char *category, const char *color);
 XBT_PUBLIC(void) TRACE_msg_set_task_category(m_task_t task,
                                              const char *category);

-XBT_PUBLIC(void) TRACE_msg_set_process_category(m_process_t process,
-                                                const char *category);
+void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color);

 XBT_PUBLIC(void) TRACE_user_host_variable(double time,
                                           const char *variable,
                                           double value, const char *what);
 XBT_PUBLIC(void) TRACE_user_host_variable(double time,
                                           const char *variable,
                                           double value, const char *what);


@@ -80,7 +79,7 @@ XBT_PUBLIC(void) TRACE_sd_set_task_category(SD_task_t task,
 #define TRACE_category(cat)
 #define TRACE_category_with_color(cat,color)
 #define TRACE_msg_set_task_category(task,cat)
 #define TRACE_category(cat)
 #define TRACE_category_with_color(cat,color)
 #define TRACE_msg_set_task_category(task,cat)

-#define TRACE_msg_set_process_category(proc,cat)
+#define TRACE_msg_set_process_category(proc,cat,color)

 #define TRACE_set_mask(mask)
 
 #define TRACE_host_variable_declare(var)
 #define TRACE_set_mask(mask)
 
 #define TRACE_host_variable_declare(var)

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index ba9ec37..3b31687 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -89,7 +89,6 @@ int TRACE_start()
   created_categories = xbt_dict_new();
   TRACE_msg_task_alloc();
   TRACE_surf_alloc();
   created_categories = xbt_dict_new();
   TRACE_msg_task_alloc();
   TRACE_surf_alloc();

-  TRACE_msg_process_alloc();

   TRACE_smpi_alloc();
   return 0;
 }
   TRACE_smpi_alloc();
   return 0;
 }

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index 7c4fce3..8adf4d9 100644 (file)
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -8,182 +8,116 @@
 
 #ifdef HAVE_TRACING
 
 
 #ifdef HAVE_TRACING
 

-static xbt_dict_t process_containers = NULL;
-
-char *TRACE_process_alias_container(m_process_t process, m_host_t host,
-                                    char *output, int len)
-{
-  if (output) {
-    snprintf(output, len, "%p-%p", process, host);
-    return output;
-  } else {
-    return NULL;
-  }
-}
-
-char *TRACE_process_container(m_process_t process, char *output, int len)
-{
-  if (output) {
-    snprintf(output, len, "%s-%p", MSG_process_get_name(process), process);
-    return output;
-  } else {
-    return NULL;
-  }
-}
-
-void TRACE_msg_process_alloc(void)
-{
-  process_containers = xbt_dict_new();
-}
-
-void TRACE_msg_process_release(void)
-{
-  xbt_dict_free(&process_containers);
-}
-
-static void TRACE_msg_process_location(m_process_t process)
-{
-  char name[200], alias[200];
-  m_host_t host = NULL;
-  if (!(TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()))
-    return;
-
-  host = MSG_process_get_host(process);
-  TRACE_process_container(process, name, 200);
-  TRACE_process_alias_container(process, host, alias, 200);
-
-  //check if process_alias container is already created
-  if (!xbt_dict_get_or_null(process_containers, alias)) {
-    pajeCreateContainer(MSG_get_clock(), alias, "PROCESS",
-                        MSG_host_get_name(host), name);
-    if (TRACE_msg_process_is_enabled())
-      pajeSetState(MSG_get_clock(), "category", alias, process->category);
-    xbt_dict_set(process_containers, xbt_strdup(alias), xbt_strdup("1"),
-                 xbt_free);
-  }
-}
-
-static void TRACE_msg_process_present(m_process_t process)
-{
-  char alias[200];
-  m_host_t host = NULL;
-  if (!TRACE_msg_process_is_enabled())
-    return;
-
-  //updating presence state of this process location
-  host = MSG_process_get_host(process);
-  TRACE_process_alias_container(process, host, alias, 200);
-  pajePushState(MSG_get_clock(), "presence", alias, "presence");
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");

 
 /*
  * TRACE_msg_set_process_category: tracing interface function
  */
 
 /*
  * TRACE_msg_set_process_category: tracing interface function
  */

-void TRACE_msg_set_process_category(m_process_t process,
-                                    const char *category)
+void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color)

 {
 {

-  char name[200];

   if (!TRACE_is_active())
     return;
 
   if (!TRACE_is_active())
     return;
 

+  xbt_assert3(process->category == NULL,
+      "Process %p(%s) already has a category (%s).",
+      process, process->name, process->category);
+  xbt_assert2(process->name != NULL,
+      "Process %p(%s) must have a unique name in order to be traced.",
+      process, process->name);
+  xbt_assert3(getContainer(process->name)==NULL,
+      "Process %p(%s). Tracing already knows a process with name %s."
+      "The name of each process must be unique.", process, process->name, process->name);
+

   //set process category
   process->category = xbt_strdup(category);
   //set process category
   process->category = xbt_strdup(category);

-
-  //create container of type "PROCESS" to indicate location
-  TRACE_msg_process_location(process);
-  TRACE_msg_process_present(process);
-
-  //create container of type "process" to indicate behavior
-  TRACE_process_container(process, name, 200);
-  if (TRACE_msg_process_is_enabled())
-    pajeCreateContainer(MSG_get_clock(), name, "process", category, name);
-  if (TRACE_msg_process_is_enabled())
-    pajeSetState(MSG_get_clock(), "process-state", name, "executing");
+  DEBUG3("MSG process %p(%s), category %s", process, process->name, process->category);
+
+  m_host_t host = MSG_process_get_host(process);
+  container_t host_container = getContainer(host->name);
+  container_t msg = newContainer(process->name, INSTR_MSG, host_container);
+  type_t type = getType (category);
+  if (!type){
+    type = newVariableType(category, TYPE_VARIABLE, color, msg->type);
+  }
+  pajeSetVariable(SIMIX_get_clock(), type->id, msg->id, "1");

 }
 
 /*
  * Instrumentation functions to trace MSG processes (m_process_t)
  */
 }
 
 /*
  * Instrumentation functions to trace MSG processes (m_process_t)
  */

-void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host,
-                                   m_host_t new_host)
+void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_host_t new_host)

 {
 {

-  char alias[200];
-  if (!(TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) || !process->category)
-    return;
+  if (!(TRACE_is_enabled() &&
+      TRACE_msg_process_is_enabled() &&
+      process->category)) return;

 
 

-  //disabling presence in old_host (__TRACE_msg_process_not_present)
-  TRACE_process_alias_container(process, old_host, alias, 200);
-  if (TRACE_msg_process_is_enabled())
-    pajePopState(MSG_get_clock(), "presence", alias);
+  //destroy existing container of this process
+  destroyContainer(getContainer(process->name));

 
 

-  TRACE_msg_process_location(process);
-  TRACE_msg_process_present(process);
+  //create new container on the new_host location
+  container_t msg = newContainer(process->name, INSTR_MSG, getContainer(new_host->name));
+  type_t type = getType (process->category);
+  pajeSetVariable(SIMIX_get_clock(), type->id, msg->id, "1");

 }
 
 void TRACE_msg_process_kill(m_process_t process)
 {
 }
 
 void TRACE_msg_process_kill(m_process_t process)
 {

-  char name[200];
-  if (!TRACE_msg_process_is_enabled() || !process->category)
-    return;
+  if (!(TRACE_is_enabled() &&
+      TRACE_msg_process_is_enabled() &&
+      process->category)) return;

 
 

-  TRACE_process_container(process, name, 200);
-  pajeDestroyContainer(MSG_get_clock(), "process", name);
+  //kill means that this process no longer exists, let's destroy it
+  destroyContainer (getContainer(process->name));

 }
 
 void TRACE_msg_process_suspend(m_process_t process)
 {
 }
 
 void TRACE_msg_process_suspend(m_process_t process)
 {

-  char name[200];
-  if (!TRACE_msg_process_is_enabled() || !process->category)
-    return;
+  if (!(TRACE_is_enabled() &&
+      TRACE_msg_process_is_enabled() &&
+      process->category)) return;

 
 

-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "suspend");
+  //FIXME
+  //pajeSetState(MSG_get_clock(), "process-state", name, "suspend");

 }
 
 void TRACE_msg_process_resume(m_process_t process)
 {
 }
 
 void TRACE_msg_process_resume(m_process_t process)
 {

-  char name[200];
-  if (!TRACE_msg_process_is_enabled() || !process->category)
-    return;
+  if (!(TRACE_is_enabled() &&
+      TRACE_msg_process_is_enabled() &&
+      process->category)) return;

 
 

-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "executing");
+  //FIXME
+  //pajeSetState(MSG_get_clock(), "process-state", name, "executing");

 }
 
 void TRACE_msg_process_sleep_in(m_process_t process)
 {
 }
 
 void TRACE_msg_process_sleep_in(m_process_t process)
 {

-  char name[200];
-  if (!TRACE_msg_process_is_enabled() || !process->category)
-    return;
+  if (!(TRACE_is_enabled() &&
+      TRACE_msg_process_is_enabled() &&
+      process->category)) return;

 
 

-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "sleep");
+  //FIXME
+  //pajeSetState(MSG_get_clock(), "process-state", name, "sleep");

 }
 
 void TRACE_msg_process_sleep_out(m_process_t process)
 {
 }
 
 void TRACE_msg_process_sleep_out(m_process_t process)
 {

-  char name[200];
-  if (!TRACE_msg_process_is_enabled() || !process->category)
-    return;
+  if (!(TRACE_is_enabled() &&
+      TRACE_msg_process_is_enabled() &&
+      process->category)) return;

 
 

-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "executing");
+  //FIXME
+  //pajeSetState(MSG_get_clock(), "process-state", name, "executing");

 }
 
 void TRACE_msg_process_end(m_process_t process)
 {
 }
 
 void TRACE_msg_process_end(m_process_t process)
 {

-  char name[200], alias[200];
-  m_host_t host = NULL;
-  if (!!process->category)
-    return;
+  if (!(TRACE_is_enabled() &&
+      TRACE_msg_process_is_enabled() &&
+      process->category)) return;

 
 

-  host = MSG_process_get_host(process);
-  TRACE_process_container(process, name, 200);
-  TRACE_process_alias_container(process, host, alias, 200);
-  if (TRACE_msg_process_is_enabled())
-    pajeDestroyContainer(MSG_get_clock(), "process", name);
-  if (TRACE_msg_process_is_enabled())
-    pajeDestroyContainer(MSG_get_clock(), "PROCESS", alias);
+  //that's the end, let's destroy it
+  destroyContainer (getContainer(process->name));

 }
 
 #endif /* HAVE_TRACING */
 }
 
 #endif /* HAVE_TRACING */

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 2cb1409..a37934e 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -41,6 +41,7 @@ typedef enum {
   INSTR_ROUTER,
   INSTR_AS,
   INSTR_SMPI,
   INSTR_ROUTER,
   INSTR_AS,
   INSTR_SMPI,

+  INSTR_MSG,

 } e_container_types;
 
 typedef struct s_container *container_t;
 } e_container_types;
 
 typedef struct s_container *container_t;

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 75d33b2..7860792 100644 (file)
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -212,6 +212,7 @@ container_t newContainer (const char *name, e_container_types kind, container_t
       case INSTR_LINK: new->type = getContainerType ("LINK", new->father->type); break;
       case INSTR_ROUTER: new->type = getContainerType ("ROUTER", new->father->type); break;
       case INSTR_SMPI: new->type = getContainerType ("MPI", new->father->type); break;
       case INSTR_LINK: new->type = getContainerType ("LINK", new->father->type); break;
       case INSTR_ROUTER: new->type = getContainerType ("ROUTER", new->father->type); break;
       case INSTR_SMPI: new->type = getContainerType ("MPI", new->father->type); break;

+      case INSTR_MSG: new->type = getContainerType ("MSG", new->father->type); break;

       default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
     }
   }
       default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
     }
   }


@@ -509,6 +510,10 @@ static void instr_routing_parse_start_host ()
       getLinkType ("MPI_LINK", rootType, mpi, mpi);
     }
   }
       getLinkType ("MPI_LINK", rootType, mpi, mpi);
     }
   }

+
+  if (TRACE_msg_process_is_enabled()) {
+    getContainerType("MSG", new->type);
+  }

 }
 
 static void instr_routing_parse_end_host ()
 }
 
 static void instr_routing_parse_end_host ()