X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e54c5e982d2a6dd3d2d152038819639b088a1086..0f5e8daaa6e9f74521068aa75837200bcd182ea6:/src/instr/msg_process_instr.c

diff --git a/src/instr/msg_process_instr.c b/src/instr/msg_process_instr.c
index 44afeafa4e..d09b8f2a90 100644
--- a/src/instr/msg_process_instr.c
+++ b/src/instr/msg_process_instr.c
@@ -10,138 +10,159 @@
 
 static xbt_dict_t process_containers = NULL;
 
-void TRACE_msg_process_alloc (void)
+void TRACE_msg_process_alloc(void)
 {
   process_containers = xbt_dict_new();
 }
 
-void TRACE_msg_process_release (void)
+void TRACE_msg_process_release(void)
 {
-  xbt_dict_free (&process_containers);
+  xbt_dict_free(&process_containers);
 }
 
-static void TRACE_msg_process_location (m_process_t process)
+static void TRACE_msg_process_location(m_process_t process)
 {
-	char name[200], alias[200];
-	m_host_t host = NULL;
-  if (!(IS_TRACING_PROCESSES || IS_TRACING_VOLUME)) return;
+  char name[200], alias[200];
+  m_host_t host = NULL;
+  if (!(IS_TRACING_PROCESSES || IS_TRACING_VOLUME))
+    return;
 
-  host = MSG_process_get_host (process);
-  TRACE_process_container (process, name, 200);
-  TRACE_process_alias_container (process, host, alias, 200);
+  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 (IS_TRACING_PROCESSES) pajeSetState (MSG_get_clock(), "category", alias, process->category);
-    xbt_dict_set (process_containers, xbt_strdup(alias), xbt_strdup("1"), xbt_free);
+  if (!xbt_dict_get_or_null(process_containers, alias)) {
+    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);
   }
 }
 
-static void TRACE_msg_process_present (m_process_t process)
+static void TRACE_msg_process_present(m_process_t process)
 {
-	char alias[200];
-	m_host_t host = NULL;
-  if (!IS_TRACING_PROCESSES) return;
+  char alias[200];
+  m_host_t host = NULL;
+  if (!IS_TRACING_PROCESSES)
+    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");
+  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
  */
-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)
 {
-	char name[200];
-  if (!IS_TRACING) return;
+  char name[200];
+  if (!IS_TRACING)
+    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);
+  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 (IS_TRACING_PROCESSES) pajeCreateContainer (MSG_get_clock(), name, "process", category, name);
-  if (IS_TRACING_PROCESSES) pajeSetState (MSG_get_clock(), "process-state", name, "executing");
+  TRACE_process_container(process, name, 200);
+  if (IS_TRACING_PROCESSES)
+    pajeCreateContainer(MSG_get_clock(), name, "process", category, name);
+  if (IS_TRACING_PROCESSES)
+    pajeSetState(MSG_get_clock(), "process-state", name, "executing");
 }
 
 /*
  * 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 (!(IS_TRACING_PROCESSES || IS_TRACING_VOLUME) || !IS_TRACED(process)) return;
+  char alias[200];
+  if (!(IS_TRACING_PROCESSES || IS_TRACING_VOLUME) || !IS_TRACED(process))
+    return;
 
   //disabling presence in old_host (__TRACE_msg_process_not_present)
-  TRACE_process_alias_container (process, old_host, alias, 200);
-  if (IS_TRACING_PROCESSES) pajePopState (MSG_get_clock(), "presence", alias);
+  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_msg_process_present (process);
+  TRACE_msg_process_location(process);
+  TRACE_msg_process_present(process);
 }
 
-void TRACE_msg_process_kill (m_process_t process)
+void TRACE_msg_process_kill(m_process_t process)
 {
-	char name[200];
-  if (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
+  char name[200];
+  if (!IS_TRACING_PROCESSES || !IS_TRACED(process))
+    return;
 
-  TRACE_process_container (process, name, 200);
-  pajeDestroyContainer (MSG_get_clock(), "process", name);
+  TRACE_process_container(process, name, 200);
+  pajeDestroyContainer(MSG_get_clock(), "process", name);
 }
 
-void TRACE_msg_process_suspend (m_process_t process)
-{  char name[200];
-  if (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
+void TRACE_msg_process_suspend(m_process_t process)
+{
+  char name[200];
+  if (!IS_TRACING_PROCESSES || !IS_TRACED(process))
+    return;
 
-  TRACE_process_container (process, name, 200);
-  pajeSetState (MSG_get_clock(), "process-state", name, "suspend");
+  TRACE_process_container(process, name, 200);
+  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 (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
+  if (!IS_TRACING_PROCESSES || !IS_TRACED(process))
+    return;
 
-  TRACE_process_container (process, name, 200);
-  pajeSetState (MSG_get_clock(), "process-state", name, "executing");
+  TRACE_process_container(process, name, 200);
+  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 (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
+  char name[200];
+  if (!IS_TRACING_PROCESSES || !IS_TRACED(process))
+    return;
 
-  TRACE_process_container (process, name, 200);
-  pajeSetState (MSG_get_clock(), "process-state", name, "sleep");
+  TRACE_process_container(process, name, 200);
+  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 (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
+  char name[200];
+  if (!IS_TRACING_PROCESSES || !IS_TRACED(process))
+    return;
 
-  TRACE_process_container (process, name, 200);
-  pajeSetState (MSG_get_clock(), "process-state", name, "executing");
+  TRACE_process_container(process, name, 200);
+  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 (!IS_TRACED(process)) return;
-
-  host = MSG_process_get_host (process);
-  TRACE_process_container (process, name, 200);
-  TRACE_process_alias_container (process, host, alias, 200);
-  if (IS_TRACING_PROCESSES) pajeDestroyContainer (MSG_get_clock(), "process", name);
-  if (IS_TRACING_PROCESSES) pajeDestroyContainer (MSG_get_clock(), "PROCESS", alias);
+  char name[200], alias[200];
+  m_host_t host = NULL;
+  if (!IS_TRACED(process))
+    return;
+
+  host = MSG_process_get_host(process);
+  TRACE_process_container(process, name, 200);
+  TRACE_process_alias_container(process, host, alias, 200);
+  if (IS_TRACING_PROCESSES)
+    pajeDestroyContainer(MSG_get_clock(), "process", name);
+  if (IS_TRACING_PROCESSES)
+    pajeDestroyContainer(MSG_get_clock(), "PROCESS", alias);
 }
 
 #endif