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

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

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 58c8045..4ab3eea 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -9,6 +9,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
+#include "xbt/virtu.h" /* set the XBT virtualization to use GRAS */
 #include "xbt/module.h" /* xbt_init/exit */
 
 #include "Virtu/virtu_interface.h" /* Module mechanism FIXME: deplace&rename */
@@ -23,7 +24,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras,XBT_LOG_ROOT_CAT,"All GRAS categories (cf. section \ref GRAS_API)");
 static int gras_running_process = 0;
-
 #if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
 static void gras_sigusr_handler(int sig) {
    INFO0("SIGUSR1 received. Display the backtrace");
@@ -45,7 +45,8 @@ static void gras_sigint_handler(int sig) {
 void gras_init(int *argc,char **argv) {
 
   VERB0("Initialize GRAS");
-  
+
+  xbt_getpid = &gras_os_getpid;
   /* First initialize the XBT */
   xbt_init(argc,argv);
    
@@ -100,7 +101,8 @@ void gras_exit(void) {
 const char *hexa_str(unsigned char *data, int size, int downside) {
   static char*buff=NULL;
   static int buffsize=0;
-  int i,pos=0; 
+  int i,pos=0;
+  int begin,increment; 
   
   if (buffsize<5*(size+1)) {
     if (buff)
@@ -109,7 +111,7 @@ const char *hexa_str(unsigned char *data, int size, int downside) {
     buff=xbt_malloc(buffsize);
   }
    
-  int begin,increment;   
+
   if (downside) {
      begin=size-1;
      increment=-1;