X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a181cc2634030aa03273398e72875a4d2033d343..7705e849132559bfd169a04c26296cc22f2d3743:/src/instr/instr_msg_process.c

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index 6b6408d718..29d321b643 100644
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -5,143 +5,148 @@
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "instr/instr_private.h"
+#include "mc/mc.h"
 
 #ifdef HAVE_TRACING
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
+char *instr_process_id (msg_process_t proc, char *str, int len)
+{
+  return instr_process_id_2 (proc->name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
+}
+
+char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
+{
+  snprintf (str, len, "%s-%d", process_name, process_pid);
+  return str;
+}
+
 /*
- * TRACE_msg_set_process_category: tracing interface function
+ * Instrumentation functions to trace MSG processes (msg_process_t)
  */
-void TRACE_msg_set_process_category(m_process_t process, const char *category, const char *color)
+void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host)
 {
-  if (!TRACE_msg_process_is_enabled()) 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);
-
-  if (category == NULL) {
-    //if user provides a NULL category, process is no longer traced
-    xbt_free (process->category);
-    process->category = NULL;
-    return;
-  }
+  if (TRACE_msg_process_is_enabled()){
+    static long long int counter = 0;
 
-  //set process category
-  process->category = xbt_strdup(category);
-  DEBUG3("MSG process %p(%s), category %s", process, process->name, process->category);
+    if(MC_is_active())
+      MC_ignore_data_bss(&counter, sizeof(counter));
 
-  m_host_t host = MSG_process_get_host(process);
-  container_t host_container = getContainer(host->name);
-  container_t msg = newContainer(process->name, INSTR_MSG_PROCESS, host_container);
-  type_t type = getType (category);
-  if (!type){
-    type = getVariableType(category, color, msg->type);
-  }
-  new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
+    char key[INSTR_DEFAULT_STR_SIZE];
+    snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
+
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
+
+    //start link
+    container_t msg = PJ_container_get (instr_process_id(process, str, len));
+    type_t type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
+    new_pajeStartLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+
+    //destroy existing container of this process
+    TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process), old_host);
 
-  type = getType ("MSG_PROCESS_STATE");
-  new_pajeSetState (MSG_get_clock(), msg, type, "executing");
+    //create new container on the new_host location
+    TRACE_msg_process_create (MSG_process_get_name (process), MSG_process_get_PID (process), new_host);
+
+    //end link
+    msg = PJ_container_get(instr_process_id(process, str, len));
+    type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
+    new_pajeEndLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+  }
 }
 
-/*
- * 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_create (const char *process_name, int process_pid, msg_host_t host)
 {
-  if (!(TRACE_msg_process_is_enabled() &&
-        process->category)) return;
-
-  static long long int counter = 0;
-  char key[INSTR_DEFAULT_STR_SIZE];
-  snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
-
-  //start link
-  container_t msg = getContainer(process->name);
-  type_t type = getType ("MSG_PROCESS_LINK");
-  new_pajeStartLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
-
-  //destroy existing container of this process
-  destroyContainer(getContainer(process->name));
-
-  //create new container on the new_host location
-  msg = newContainer(process->name, INSTR_MSG_PROCESS, getContainer(new_host->name));
-  type = getType (process->category);
-  new_pajeSetVariable (MSG_get_clock(), msg, type, 1);
-
-  //set the state of this new container
-  type = getType ("MSG_PROCESS_STATE");
-  new_pajeSetState (MSG_get_clock(), msg, type, "executing");
-
-  //end link
-  msg = getContainer(process->name);
-  type = getType ("MSG_PROCESS_LINK");
-  new_pajeEndLink (MSG_get_clock(), getRootContainer(), type, msg, "M", key);
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
+
+    container_t host_container = PJ_container_get (SIMIX_host_get_name(host->smx_host));
+    PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
+  }
 }
 
-void TRACE_msg_process_kill(m_process_t process)
+void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host)
 {
-  if (!(TRACE_msg_process_is_enabled() &&
-        process->category)) return;
+  int len = INSTR_DEFAULT_STR_SIZE;
+  char str[INSTR_DEFAULT_STR_SIZE];
 
-  //kill means that this process no longer exists, let's destroy it
-  destroyContainer (getContainer(process->name));
+  container_t process = PJ_container_get (instr_process_id_2 (process_name, process_pid, str, len));
+  PJ_container_remove_from_parent (process);
+  PJ_container_free (process);
 }
 
-void TRACE_msg_process_suspend(m_process_t process)
+void TRACE_msg_process_kill(msg_process_t process)
 {
-  if (!(TRACE_msg_process_is_enabled() &&
-      process->category)) return;
+  if (TRACE_msg_process_is_enabled()){
+    //kill means that this process no longer exists, let's destroy it
+    TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process), MSG_process_get_host (process));
+  }
+}
 
-  container_t process_container = getContainer (process->name);
-  type_t type = getType ("MSG_PROCESS_STATE");
-  new_pajePushState (MSG_get_clock(), process_container, type, "suspend");
+void TRACE_msg_process_suspend(msg_process_t process)
+{
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
+
+    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
+    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+    val_t value = PJ_value_get ("suspend", type);
+    new_pajePushState (MSG_get_clock(), process_container, type, value);
+  }
 }
 
-void TRACE_msg_process_resume(m_process_t process)
+void TRACE_msg_process_resume(msg_process_t process)
 {
-  if (!(TRACE_msg_process_is_enabled() &&
-        process->category)) return;
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
 
-  container_t process_container = getContainer (process->name);
-  type_t type = getType ("MSG_PROCESS_STATE");
-  new_pajePopState (MSG_get_clock(), process_container, type);
+    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
+    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+    new_pajePopState (MSG_get_clock(), process_container, type);
+  }
 }
 
-void TRACE_msg_process_sleep_in(m_process_t process)
+void TRACE_msg_process_sleep_in(msg_process_t process)
 {
-  if (!(TRACE_msg_process_is_enabled() &&
-        process->category)) return;
-
-  container_t process_container = getContainer (process->name);
-  type_t type = getType ("MSG_PROCESS_STATE");
-  new_pajePushState (MSG_get_clock(), process_container, type, "sleep");
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
+
+    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
+    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+    val_t value = PJ_value_get ("sleep", type);
+    new_pajePushState (MSG_get_clock(), process_container, type, value);
+  }
 }
 
-void TRACE_msg_process_sleep_out(m_process_t process)
+void TRACE_msg_process_sleep_out(msg_process_t process)
 {
-  if (!(TRACE_msg_process_is_enabled() &&
-        process->category)) return;
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
 
-  container_t process_container = getContainer (process->name);
-  type_t type = getType ("MSG_PROCESS_STATE");
-  new_pajePopState (MSG_get_clock(), process_container, type);
+    container_t process_container = PJ_container_get (instr_process_id(process, str, len));
+    type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
+    new_pajePopState (MSG_get_clock(), process_container, type);
+  }
 }
 
-void TRACE_msg_process_end(m_process_t process)
+void TRACE_msg_process_end(msg_process_t process)
 {
-  if (!(TRACE_msg_process_is_enabled() &&
-        process->category)) return;
-
-  //that's the end, let's destroy it
-  destroyContainer (getContainer(process->name));
+  if (TRACE_msg_process_is_enabled()) {
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
+
+    //that's the end, let's destroy it
+    container_t container = PJ_container_get (instr_process_id(process, str, len));
+    PJ_container_remove_from_parent (container);
+    PJ_container_free (container);
+  }
 }
 
 #endif /* HAVE_TRACING */