From 61e745a2f451d107f45d7c5cb8b2e48648330c4e Mon Sep 17 00:00:00 2001
From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 1 Mar 2005 06:06:28 +0000
Subject: [PATCH] Moving functions to the right location and making them work.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1122 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/gras/Virtu/rl_process.c |  3 ++-
 src/gras/Virtu/sg_process.c | 10 ++++++++++
 src/msg/m_process.c         | 12 ------------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c
index 716c80715e..f602d7a2da 100644
--- a/src/gras/Virtu/rl_process.c
+++ b/src/gras/Virtu/rl_process.c
@@ -29,7 +29,8 @@ xbt_error_t gras_process_exit() {
 }
 
 const char *xbt_procname(void) {
-   return _gras_procname;
+  if(_gras_procname) return _gras_procname;
+  else return "(null)";
 }
 
 /* **************************************************************************
diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 838a74c864..0c51c0e452 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -124,3 +124,13 @@ gras_procdata_t *gras_procdata_get(void) {
   return pd;
 }
 
+const char* xbt_procname(void) {
+  const char *res = NULL;
+  m_process_t process = MSG_process_self();
+  if ((process != NULL) && (process->simdata))
+    res = MSG_process_get_name(process);
+  if (res) 
+    return res;
+  else
+    return "";
+}
diff --git a/src/msg/m_process.c b/src/msg/m_process.c
index 63a43d1f1d..36ed639758 100644
--- a/src/msg/m_process.c
+++ b/src/msg/m_process.c
@@ -482,15 +482,3 @@ int __MSG_process_isBlocked(m_process_t process)
 
   return (process->simdata->blocked);
 }
-
-
-const char* xbt_procname(void) {
-  char *res = NULL;
-  m_process_t process = MSG_process_self();
-  if ((process != NULL) && (process->simdata))
-    res = (char *)MSG_process_get_name(process);
-  if (res) 
-    return (const char*)res;
-  else
-    return "";
-}
-- 
2.20.1