Convert GRAS pid from long int to int; setup a virtualization layer in XBT to choose...

[simgrid.git] / src / gras / Virtu / rl_process.c

diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c
index f30aa38..7219c9a 100644 (file)
--- a/src/gras/Virtu/rl_process.c
+++ b/src/gras/Virtu/rl_process.c
@@ -11,22 +11,17 @@
 #include "gras/Virtu/virtu_rl.h"
 #include "portable.h"
 
-XBT_LOG_EXTERNAL_CATEGORY(process);
-XBT_LOG_DEFAULT_CATEGORY(process);
-
 /* globals */
 static gras_procdata_t *_gras_procdata = NULL;
-char const *_gras_procname = NULL;
+XBT_PUBLIC_DATA(char const *) _gras_procname = NULL;
 
-xbt_error_t gras_process_init() {
-  _gras_procdata=xbt_new(gras_procdata_t,1);
+void gras_process_init() {
+  _gras_procdata=xbt_new0(gras_procdata_t,1);
   gras_procdata_init();
-  return no_error;
 }
-xbt_error_t gras_process_exit() {
+void gras_process_exit() {
   gras_procdata_exit();
   free(_gras_procdata);
-  return no_error;
 }
 
 const char *xbt_procname(void) {
@@ -35,7 +30,11 @@ const char *xbt_procname(void) {
 }
 
 int gras_os_getpid(void) {
-  return getpid();
+       #ifdef _WIN32
+       return (long int) GetCurrentProcess();
+       #else
+       return (long int) getpid();
+       #endif
 }
 
 /* **************************************************************************