From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 13 Dec 2010 16:45:26 +0000 (+0000)
Subject: [trace] renaming container type of msg process
X-Git-Tag: v3.6_beta2~710
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/dd483fe1eda0d25ee9babc69af5eb3d280805b47?hp=2d5602695d43f174ff8e47f6e3c92a5f7b9790b8

[trace] renaming container type of msg process

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9213 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/instr/instr_msg_process.c b/src/instr/instr_msg_process.c
index 1109d8b7d9..ba1faf6428 100644
--- a/src/instr/instr_msg_process.c
+++ b/src/instr/instr_msg_process.c
@@ -34,7 +34,7 @@ void TRACE_msg_set_process_category(m_process_t process, const char *category, c
 
   m_host_t host = MSG_process_get_host(process);
   container_t host_container = getContainer(host->name);
-  container_t msg = newContainer(process->name, INSTR_MSG, host_container);
+  container_t msg = newContainer(process->name, INSTR_MSG_PROCESS, host_container);
   type_t type = getType (category);
   if (!type){
     type = newVariableType(category, TYPE_VARIABLE, color, msg->type);
@@ -55,7 +55,7 @@ void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host, m_hos
   destroyContainer(getContainer(process->name));
 
   //create new container on the new_host location
-  container_t msg = newContainer(process->name, INSTR_MSG, getContainer(new_host->name));
+  container_t msg = newContainer(process->name, INSTR_MSG_PROCESS, getContainer(new_host->name));
   type_t type = getType (process->category);
   pajeSetVariable(SIMIX_get_clock(), type->id, msg->id, "1");
 }
diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index a37934edf2..18c41d5330 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -41,7 +41,7 @@ typedef enum {
   INSTR_ROUTER,
   INSTR_AS,
   INSTR_SMPI,
-  INSTR_MSG,
+  INSTR_MSG_PROCESS,
 } e_container_types;
 
 typedef struct s_container *container_t;
diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 7860792b16..c65dabf137 100644
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -212,7 +212,7 @@ container_t newContainer (const char *name, e_container_types kind, container_t
       case INSTR_LINK: new->type = getContainerType ("LINK", new->father->type); break;
       case INSTR_ROUTER: new->type = getContainerType ("ROUTER", new->father->type); break;
       case INSTR_SMPI: new->type = getContainerType ("MPI", new->father->type); break;
-      case INSTR_MSG: new->type = getContainerType ("MSG", new->father->type); break;
+      case INSTR_MSG_PROCESS: new->type = getContainerType ("MSG_PROCESS", new->father->type); break;
       default: xbt_die ("Congratulations, you have found a bug on newContainer function of instr_routing.c"); break;
     }
   }
@@ -512,7 +512,7 @@ static void instr_routing_parse_start_host ()
   }
 
   if (TRACE_msg_process_is_enabled()) {
-    getContainerType("MSG", new->type);
+    getContainerType("MSG_PROCESS", new->type);
   }
 }