also save the cbps in SG, the same way I do in RL since a long time. I love calltree

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

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 740c7a7..28a5ead 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -17,13 +17,29 @@
 #include "gras.h"
 #include "gras/process.h" /* FIXME: killme and put process_init in modinter */
 
-/* FIXME: move it to some random header */
-void hexa_print(const char*name, unsigned char *data, int size);
-
+#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();
+}
+
+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) {
 
   VERB0("Initialize GRAS");
@@ -52,6 +68,10 @@ void gras_init(int *argc,char **argv) {
     gras_msg_init();
     gras_trp_init();
     gras_datadesc_init();
+#if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
+    signal(SIGUSR1,gras_sigusr_handler);
+    signal(SIGINT,gras_sigint_handler);
+#endif     
   }
 }
 
@@ -67,15 +87,28 @@ void gras_exit(void) {
   xbt_exit();
 }
 
-void hexa_print(const char*name, unsigned char *data, int size) {
-   int i;
-   printf("%s: ", name);
-   for (i=0;i<size;i++)  {
-      if (data[i]<32) /* || data[i]>'9') */
-       printf("'\\%d'",data[i]);
-      else
-       printf("%c",data[i]);
+const char *hexa_str(unsigned char *data, int size) {
+  static char*buff=NULL;
+  static int buffsize=0;
+  int i,pos=0; 
+  
+  if (buffsize<5*(size+1)) {
+    if (buff)
+      free(buff);
+    buffsize=5*(size+1);
+    buff=xbt_malloc(buffsize);
+  }
+  for (i=0;i<size;i++)  {
+    if (data[i]<32 || data[i]>126)
+      sprintf(buff+pos,".(%02x)",data[i]);
+    else
+      sprintf(buff+pos,"%c(%02x)",data[i],data[i]);
+    while (buff[++pos]);
    }
-   printf("\n");
+  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));
 }