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

diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c
index 716c807..f602d7a 100644 (file)
--- 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) {
 }
 
 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 838a74c..0c51c0e 100644 (file)
--- 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;
 }
 
   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 63a43d1..36ed639 100644 (file)
--- 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);
 }
 
   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 "";
-}