X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58823a084d5ee98512c5e61d7a7e98e2730e9fff..bff077b4621c68455a86e60292cb0bf872a879d5:/src/gras/gras.c

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 65e2ebb09a..7bf58273ca 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -9,32 +9,37 @@
  * 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 "xbt/synchro.h"
 
+#include "Virtu/virtu_interface.h" /* Module mechanism FIXME: deplace&rename */
+#include "Virtu/virtu_private.h"
 #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 "gras/Msg/msg_private.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)");
+XBT_LOG_NEW_DEFAULT_CATEGORY(gras,"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);
    }
@@ -43,8 +48,11 @@ static void gras_sigint_handler(int sig) {
 
 void gras_init(int *argc,char **argv) {
 
+	gras_procdata_t *pd;
+	gras_msg_procdata_t msg_pd;
   VERB0("Initialize GRAS");
-  
+
+  xbt_getpid = gras_os_getpid;
   /* First initialize the XBT */
   xbt_init(argc,argv);
    
@@ -52,6 +60,33 @@ void gras_init(int *argc,char **argv) {
    *    - declare process specific data we need (without creating them) 
    */
   if (gras_running_process == 0) {
+     /* Connect our log channels: that must be done manually under windows */
+     XBT_LOG_CONNECT(gras_ddt, gras);
+       XBT_LOG_CONNECT(gras_ddt_cbps, gras_ddt);
+       XBT_LOG_CONNECT(gras_ddt_convert, gras_ddt);
+       XBT_LOG_CONNECT(gras_ddt_create, gras_ddt);
+       XBT_LOG_CONNECT(gras_ddt_exchange, gras_ddt);
+       XBT_LOG_CONNECT(gras_ddt_lexer, gras_ddt_parse);
+       XBT_LOG_CONNECT(gras_ddt_parse, gras_ddt);
+     
+     XBT_LOG_CONNECT(gras_modules, gras);
+     
+     XBT_LOG_CONNECT(gras_msg, gras);
+       XBT_LOG_CONNECT(gras_msg_read, gras_msg);
+       XBT_LOG_CONNECT(gras_msg_rpc, gras_msg);
+     
+     XBT_LOG_CONNECT(gras_timer, gras);
+     
+     XBT_LOG_CONNECT(gras_trp, gras);
+       XBT_LOG_CONNECT(gras_trp_file, gras_trp);
+       XBT_LOG_CONNECT(gras_trp_meas, gras_trp);
+       XBT_LOG_CONNECT(gras_trp_sg, gras_trp);
+       XBT_LOG_CONNECT(gras_trp_tcp, gras_trp);
+     
+     XBT_LOG_CONNECT(gras_virtu, gras);
+       XBT_LOG_CONNECT(gras_virtu_emul, gras_virtu);
+       XBT_LOG_CONNECT(gras_virtu_process, gras_virtu);
+     
      gras_trp_register();
      gras_msg_register();
   }
@@ -70,31 +105,43 @@ 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();
+	pd = gras_procdata_get();
+	msg_pd = gras_libdata_by_name("gras_msg");
+	pd->listener = gras_msg_listener_launch(msg_pd->msg_received);
 }
 
 void gras_exit(void) {
+	gras_procdata_t *pd;
   INFO0("Exiting GRAS");
+  amok_exit();
+  gras_moddata_leave();
+	pd = gras_procdata_get();
+	gras_msg_listener_shutdown(pd->listener);
+  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) {
+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)
@@ -102,17 +149,35 @@ const char *hexa_str(unsigned char *data, int size) {
     buffsize=5*(size+1);
     buff=xbt_malloc(buffsize);
   }
-  for (i=0;i<size;i++)  {
+   
+
+  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));
 }