[trace] simpler verifications to see what is enabled before tracing

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

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index f5f2213..05300db 100644 (file)
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -15,8 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
  */
 void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled())) return;
+  if (!TRACE_msg_process_is_enabled()) return;
 
   xbt_assert3(process->category == NULL,
       "Process %p(%s) already has a category (%s).",
@@ -46,10 +45,10 @@ void TRACE_msg_set_process_category(m_process_t process, const char *category, c
   if (!type){
     type = getVariableType(category, color, msg->type);
   }
-  pajeSetVariable(SIMIX_get_clock(), type->id, msg->id, "1");
+  new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
 
   type = getType ("MSG_PROCESS_STATE");
-  pajeSetState (MSG_get_clock(), type->id, msg->id, "executing");
+  new_pajeSetState (MSG_get_clock(), msg, type, "executing");
 }
 
 /*
@@ -57,9 +56,8 @@ void TRACE_msg_set_process_category(m_process_t process, const char *category, c
  */
 void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_host_t new_host)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled() &&
-      process->category)) return;
+  if (!(TRACE_msg_process_is_enabled() &&
+        process->category)) return;
 
   static long long int counter = 0;
   char key[INSTR_DEFAULT_STR_SIZE];
@@ -68,7 +66,7 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_hos
   //start link
   container_t msg = getContainer(process->name);
   type_t type = getType ("MSG_PROCESS_LINK");
-  pajeStartLink (MSG_get_clock(), type->id, "0", "M", msg->id, key);
+  new_pajeStartLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
 
   //destroy existing container of this process
   destroyContainer(getContainer(process->name));
@@ -76,19 +74,18 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_hos
   //create new container on the new_host location
   msg = newContainer(process->name, INSTR_MSG_PROCESS, getContainer(new_host->name));
   type = getType (process->category);
-  pajeSetVariable(SIMIX_get_clock(), type->id, msg->id, "1");
+  new_pajeSetVariable (MSG_get_clock(), msg, type, 1);
 
   //end link
   msg = getContainer(process->name);
   type = getType ("MSG_PROCESS_LINK");
-  pajeEndLink (MSG_get_clock(), type->id, "0", "M", msg->id, key);
+  new_pajeEndLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
 }
 
 void TRACE_msg_process_kill(m_process_t process)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled() &&
-      process->category)) return;
+  if (!(TRACE_msg_process_is_enabled() &&
+        process->category)) return;
 
   //kill means that this process no longer exists, let's destroy it
   destroyContainer (getContainer(process->name));
@@ -96,53 +93,48 @@ void TRACE_msg_process_kill(m_process_t process)
 
 void TRACE_msg_process_suspend(m_process_t process)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled() &&
+  if (!(TRACE_msg_process_is_enabled() &&
       process->category)) return;
 
   container_t process_container = getContainer (process->name);
   type_t type = getType ("MSG_PROCESS_STATE");
-  pajePushState (MSG_get_clock(), type->id, process_container->id, "suspend");
+  new_pajePushState (MSG_get_clock(), process_container, type, "suspend");
 }
 
 void TRACE_msg_process_resume(m_process_t process)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled() &&
-      process->category)) return;
+  if (!(TRACE_msg_process_is_enabled() &&
+        process->category)) return;
 
   container_t process_container = getContainer (process->name);
   type_t type = getType ("MSG_PROCESS_STATE");
-  pajePopState (MSG_get_clock(), type->id, process_container->id);
+  new_pajePopState (MSG_get_clock(), process_container, type);
 }
 
 void TRACE_msg_process_sleep_in(m_process_t process)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled() &&
-      process->category)) return;
+  if (!(TRACE_msg_process_is_enabled() &&
+        process->category)) return;
 
   container_t process_container = getContainer (process->name);
   type_t type = getType ("MSG_PROCESS_STATE");
-  pajePushState (MSG_get_clock(), type->id, process_container->id, "sleep");
+  new_pajePushState (MSG_get_clock(), process_container, type, "sleep");
 }
 
 void TRACE_msg_process_sleep_out(m_process_t process)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled() &&
-      process->category)) return;
+  if (!(TRACE_msg_process_is_enabled() &&
+        process->category)) return;
 
   container_t process_container = getContainer (process->name);
   type_t type = getType ("MSG_PROCESS_STATE");
-  pajePopState (MSG_get_clock(), type->id, process_container->id);
+  new_pajePopState (MSG_get_clock(), process_container, type);
 }
 
 void TRACE_msg_process_end(m_process_t process)
 {
-  if (!(TRACE_is_enabled() &&
-      TRACE_msg_process_is_enabled() &&
-      process->category)) return;
+  if (!(TRACE_msg_process_is_enabled() &&
+        process->category)) return;
 
   //that's the end, let's destroy it
   destroyContainer (getContainer(process->name));