X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a182030b5a8c0db05a1de18ca230b61e76363ebc..65e338fbfd769d49b29242bfe56cde18c03b6074:/src/instr/msg_process_instr.c

diff --git a/src/instr/msg_process_instr.c b/src/instr/msg_process_instr.c
index 03da8b2b69..38564b5fe6 100644
--- a/src/instr/msg_process_instr.c
+++ b/src/instr/msg_process_instr.c
@@ -1,14 +1,8 @@
-/*
- * msg_process_instr.c
- *
- *  Created on: Feb 24, 2010
- *      Author: Lucas Schnorr
- *     License: This program is free software; you can redistribute
- *              it and/or modify it under the terms of the license
- *              (GNU LGPL) which comes with this package.
- *
- *     Copyright (c) 2009 The SimGrid team.
- */
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "instr/private.h"
 
@@ -23,35 +17,50 @@ void __TRACE_msg_process_init (void)
 
 void __TRACE_msg_process_location (m_process_t process)
 {
-  char name[200], alias[200];
-  m_host_t host = MSG_process_get_host (process);
+	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);
 
   //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)
+{
+	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");
+}
+
 /*
  * TRACE_msg_set_process_category: tracing interface function
  */
 void TRACE_msg_set_process_category (m_process_t process, const char *category)
 {
+	char name[200];
   if (!IS_TRACING) return;
 
   //set process category
-  process->category = xbt_new (char, strlen (category)+1);
-  strncpy (process->category, category, strlen(category)+1);
+  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
-  char name[200];
   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");
@@ -62,68 +71,68 @@ 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;
+	char alias[200];
+  if (!(IS_TRACING_PROCESSES || IS_TRACING_VOLUME) || !IS_TRACED(process)) return;
 
-  char alias[200];
+  //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_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)
 {
+	char name[200];
   if (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
 
-  char name[200];
   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;
 
-  char name[200];
   TRACE_process_container (process, name, 200);
   pajeSetState (MSG_get_clock(), "process-state", name, "suspend");
 }
 
 void TRACE_msg_process_resume (m_process_t process)
 {
+  char name[200];
   if (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
 
-  char name[200];
   TRACE_process_container (process, name, 200);
   pajeSetState (MSG_get_clock(), "process-state", name, "executing");
 }
 
 void TRACE_msg_process_sleep_in (m_process_t process)
 {
+	char name[200];
   if (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
 
-  char name[200];
   TRACE_process_container (process, name, 200);
   pajeSetState (MSG_get_clock(), "process-state", name, "sleep");
 }
 
 void TRACE_msg_process_sleep_out (m_process_t process)
 {
+	char name[200];
   if (!IS_TRACING_PROCESSES || !IS_TRACED(process)) return;
 
-  char name[200];
   TRACE_process_container (process, name, 200);
   pajeSetState (MSG_get_clock(), "process-state", name, "executing");
 }
 
 void TRACE_msg_process_end (m_process_t process)
 {
+	char name[200], alias[200];
+	m_host_t host = NULL;
   if (!IS_TRACED(process)) return;
 
-  char name[200], alias[200];
-  m_host_t host = MSG_process_get_host (process);
+  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);