SIGURS1 is not defined on windows (but signal() and signal.h are both here)

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

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 576f2d7..a85be22 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -12,6 +12,7 @@
 #include "xbt/module.h" /* xbt_init/exit */
 
 #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"
@@ -27,6 +28,17 @@ static void gras_sigusr_handler(int sig) {
    INFO0("SIGUSR1 received. Display the backtrace");
    xbt_backtrace_display();
 }
+
+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");
+   } else {
+      exit(1);
+   }
+}
 #endif
 
 void gras_init(int *argc,char **argv) {
@@ -58,9 +70,15 @@ void gras_init(int *argc,char **argv) {
     gras_trp_init();
     gras_datadesc_init();
 #if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
+# ifdef SIGUSR1
     signal(SIGUSR1,gras_sigusr_handler);
+# endif
+    signal(SIGINT,gras_sigint_handler);
 #endif     
   }
+   
+  /* and then init amok */
+  amok_init();
 }
 
 void gras_exit(void) {
@@ -75,7 +93,7 @@ void gras_exit(void) {
   xbt_exit();
 }
 
-const char *hexa_str(unsigned char *data, int size) {
+const char *hexa_str(unsigned char *data, int size, int downside) {
   static char*buff=NULL;
   static int buffsize=0;
   int i,pos=0; 
@@ -86,17 +104,35 @@ const char *hexa_str(unsigned char *data, int size) {
     buffsize=5*(size+1);
     buff=xbt_malloc(buffsize);
   }
-  for (i=0;i<size;i++)  {
+   
+  int begin,increment;   
+  if (downside) {
+     begin=size-1;
+     increment=-1;
+  } else {
+     begin=0;
+     increment=1;
+  }
+   
+  for (i=begin; 0<=i && i<size ; i+=increment)  {
     if (data[i]<32 || data[i]>126)
-      sprintf(buff+pos,".(%02x)",data[i]);
+      sprintf(buff+pos,".");
     else
-      sprintf(buff+pos,"%c(%02x)",data[i],data[i]);
+      sprintf(buff+pos,"%c",data[i]);
+    while (buff[++pos]);
+   }
+  sprintf(buff+pos,"(");
+  while (buff[++pos]);
+  for (i=begin; 0<=i && i<size ; i+=increment)  {
+    sprintf(buff+pos,"%02x",data[i]);
     while (buff[++pos]);
    }
+  sprintf(buff+pos,")");
+  while (buff[++pos]);
   buff[pos]='\0';  
   return buff;
 }
 void hexa_print(const char*name, unsigned char *data, int size) {
-   printf("%s: %s\n", name,hexa_str(data,size));
+   printf("%s: %s\n", name,hexa_str(data,size,0));
 }