If the timeout is negative, the user wants to block

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

diff --git a/src/gras/gras.c b/src/gras/gras.c
index a85be22..7ca7b9e 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -9,32 +9,35 @@
  * 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 "xbt/xbt_os_time.h" /* xbt_os_time */
 
+#include "Virtu/virtu_interface.h" /* Module mechanism FIXME: deplace&rename */
 #include "gras_modinter.h"   /* module init/exit */
 #include "amok/amok_modinter.h"   /* module init/exit */
 #include "xbt_modinter.h"   /* module init/exit */
 
 #include "gras.h"
 #include "gras/process.h" /* FIXME: killme and put process_init in modinter */
-
+  
 #include "portable.h" /* hexa_*(); signalling stuff */
 
 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");
-   xbt_backtrace_display();
+   xbt_backtrace_display_current();
 }
 
 static void gras_sigint_handler(int sig) {
    static double lastone = 0;
-   if (lastone == 0 || gras_os_time() - lastone > 5) {
-      lastone = gras_os_time();
-      xbt_backtrace_display();
-      fprintf(stderr,"\nBacktrace displayed because Ctrl-C was pressed. Press again (within 5 sec) to abort the process.\n");
+   if (lastone == 0 || xbt_os_time() - lastone > 5) {
+      xbt_backtrace_display_current();
+      fprintf(stderr,
+             "\nBacktrace displayed because Ctrl-C was pressed. Press again (within 5 sec) to abort the process.\n");
+      lastone = xbt_os_time();
    } else {
       exit(1);
    }
@@ -44,7 +47,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);
    
@@ -83,20 +87,24 @@ void gras_init(int *argc,char **argv) {
 
 void gras_exit(void) {
   INFO0("Exiting GRAS");
+  amok_exit();
+  gras_moddata_leave();
+  gras_process_exit();
   if (--gras_running_process == 0) {
     gras_msg_exit();
     gras_trp_exit();
     gras_datadesc_exit();
     gras_emul_exit();
+    gras_moddata_exit();
   }
-  gras_process_exit();
   xbt_exit();
 }
 
 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)
@@ -105,7 +113,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;