X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d6561ddf1df4db72d187f86298a706ea137355b..272ccad1b68b6d9c17069f3c934886925bb15b5d:/src/instr/instr_msg_process.c

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index 7c4fce3387..c1a8154f46 100644
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -8,182 +8,135 @@
 
 #ifdef HAVE_TRACING
 
-static xbt_dict_t process_containers = NULL;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 
-char *TRACE_process_alias_container(m_process_t process, m_host_t host,
-                                    char *output, int len)
+char *instr_process_id (m_process_t proc, char *str, 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);
-  }
+  return instr_process_id_2 (proc->name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc), str, len);
 }
 
-static void TRACE_msg_process_present(m_process_t process)
+char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
 {
-  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");
+  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 (m_process_t)
  */
-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)
 {
-  char name[200];
-  if (!TRACE_is_active())
-    return;
-
-  //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");
+  if (TRACE_msg_process_is_enabled()){
+    static long long int counter = 0;
+    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
+    container_t existing_container = PJ_container_get(instr_process_id(process, str, len));
+    PJ_container_remove_from_parent (existing_container);
+    PJ_container_free(existing_container);
+
+    //create new container on the new_host location
+    msg = PJ_container_new(instr_process_id(process, str, len), INSTR_MSG_PROCESS, PJ_container_get(SIMIX_host_get_name(new_host->smx_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, m_host_t host)
 {
-  char alias[200];
-  if (!(TRACE_msg_process_is_enabled() || TRACE_msg_volume_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);
+  if (TRACE_msg_process_is_enabled()){
+    int len = INSTR_DEFAULT_STR_SIZE;
+    char str[INSTR_DEFAULT_STR_SIZE];
 
-  TRACE_msg_process_location(process);
-  TRACE_msg_process_present(process);
+    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)
 {
-  char name[200];
-  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];
 
-  TRACE_process_container(process, name, 200);
-  pajeDestroyContainer(MSG_get_clock(), "process", name);
+    //kill means that this process no longer exists, let's destroy it
+    PJ_container_free (PJ_container_get (instr_process_id(process, str, len)));
+  }
 }
 
 void TRACE_msg_process_suspend(m_process_t process)
 {
-  char name[200];
-  if (!TRACE_msg_process_is_enabled() || !process->category)
-    return;
-
-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "suspend");
+  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)
 {
-  char name[200];
-  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];
 
-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "executing");
+    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)
 {
-  char name[200];
-  if (!TRACE_msg_process_is_enabled() || !process->category)
-    return;
-
-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "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)
 {
-  char name[200];
-  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];
 
-  TRACE_process_container(process, name, 200);
-  pajeSetState(MSG_get_clock(), "process-state", name, "executing");
+    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)
 {
-  char name[200], alias[200];
-  m_host_t host = NULL;
-  if (!!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);
+  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 */