Do connect all log channel manually to parent using XBT_LOG_CONNECT() too, so that...

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

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 5aba78e..7bf5827 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -11,31 +11,35 @@
 #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);
    }
@@ -44,9 +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;
+  xbt_getpid = gras_os_getpid;
   /* First initialize the XBT */
   xbt_init(argc,argv);
    
@@ -54,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();
   }
@@ -81,12 +114,18 @@ void gras_init(int *argc,char **argv) {
    
   /* 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();