new tracing mask TRACE_VOLUME to trace the msg tasks communication size and group...

[simgrid.git] / src / instr / msg_process_instr.c

diff --git a/src/instr/msg_process_instr.c b/src/instr/msg_process_instr.c
index e1b71e1..e4e361b 100644 (file)
--- a/src/instr/msg_process_instr.c
+++ b/src/instr/msg_process_instr.c
@@ -11,7 +11,6 @@
  */
 
 #include "instr/private.h"
-#include "instr/config.h"
 
 #ifdef HAVE_TRACING
 
@@ -24,6 +23,8 @@ void __TRACE_msg_process_init (void)
 
 void __TRACE_msg_process_location (m_process_t process)
 {
+  if (!(IS_TRACING_PROCESSES || IS_TRACING_VOLUME)) return;
+
   char name[200], alias[200];
   m_host_t host = MSG_process_get_host (process);
   TRACE_process_container (process, name, 200);
@@ -31,12 +32,23 @@ void __TRACE_msg_process_location (m_process_t process)
 
   //check if process_alias container is already created
   if (!xbt_dict_get_or_null (process_containers, alias)){
-    if (IS_TRACING_PROCESSES) pajeCreateContainer (MSG_get_clock(), alias, "PROCESS", MSG_host_get_name(host), name);
-    if (IS_TRACING_PROCESSES) pajePushState (MSG_get_clock(), "presence", alias, "1");
+    pajeCreateContainer (MSG_get_clock(), alias, "PROCESS", MSG_host_get_name(host), name);
+    if (IS_TRACING_PROCESSES) pajeSetState (MSG_get_clock(), "category", alias, process->category);
     xbt_dict_set (process_containers, xbt_strdup(alias), xbt_strdup("1"), xbt_free);
   }
 }
 
+void __TRACE_msg_process_present (m_process_t process)
+{
+  if (!IS_TRACING_PROCESSES) return;
+
+  //updating presence state of this process location
+  char alias[200];
+  m_host_t host = MSG_process_get_host (process);
+  TRACE_process_alias_container (process, host, alias, 200);
+  pajePushState (MSG_get_clock(), "presence", alias, "presence");
+}
+
 /*
  * TRACE_msg_set_process_category: tracing interface function
  */
@@ -50,6 +62,7 @@ void TRACE_msg_set_process_category (m_process_t process, const char *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
   char name[200];
@@ -63,15 +76,15 @@ void TRACE_msg_set_process_category (m_process_t process, const char *category)
  */
 void TRACE_msg_process_change_host (m_process_t process, m_host_t old_host, m_host_t new_host)
 {
-  if (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
+  if (!(IS_TRACING_PROCESSES || IS_TRACING_VOLUME) || !IS_TRACED(process)) return;
 
+  //disabling presence in old_host (__TRACE_msg_process_not_present)
   char alias[200];
   TRACE_process_alias_container (process, old_host, alias, 200);
   if (IS_TRACING_PROCESSES) pajePopState (MSG_get_clock(), "presence", alias);
 
   __TRACE_msg_process_location (process);
-  TRACE_process_alias_container (process, new_host, alias, 200);
-  if (IS_TRACING_PROCESSES) pajePushState (MSG_get_clock(), "presence", alias, "1");
+  __TRACE_msg_process_present (process);
 }
 
 void TRACE_msg_process_kill (m_process_t process)