Also shut amok down

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

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 0a7ef53..b2a8c92 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -12,24 +12,42 @@
 #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/core.h"
-#include "gras/cond.h"    /* gras_if_RL() => FIXME: killme when gras/sg works */
+#include "gras.h"
 #include "gras/process.h" /* FIXME: killme and put process_init in modinter */
-#include "gras/chrono.h"
+
+#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;
 
-void gras_init(int *argc,char **argv, const char *defaultlog) {
+#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) {
 
-  INFO0("Initialize GRAS");
+  VERB0("Initialize GRAS");
   
   /* First initialize the XBT */
-  xbt_init_defaultlog(argc,argv,defaultlog);
+  xbt_init(argc,argv);
    
-  /*gras_chrono_init(); * FIXME: Arnaud, WTF?? It depends on MSG!! */
   /* module registrations: 
    *    - declare process specific data we need (without creating them) 
    */
@@ -47,19 +65,75 @@ void gras_init(int *argc,char **argv, const char *defaultlog) {
    * Initialize the global stuff if it's not the first process created
    */
   if (gras_running_process++ == 0) {
+    gras_emul_init();
     gras_msg_init();
     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) {
   INFO0("Exiting GRAS");
-  gras_process_exit();
+  amok_exit();
   if (--gras_running_process == 0) {
     gras_msg_exit();
     gras_trp_exit();
     gras_datadesc_exit();
+    gras_emul_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; 
+  
+  if (buffsize<5*(size+1)) {
+    if (buff)
+      free(buff);
+    buffsize=5*(size+1);
+    buff=xbt_malloc(buffsize);
+  }
+   
+  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,".");
+    else
+      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,0));
+}
+