on exit, close all the sockets left open and others leak plugs

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

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 5c9140e..138456f 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -15,19 +15,40 @@
 #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/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);
+
+
 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) {
 
-  INFO0("Initialize GRAS");
+  VERB0("Initialize GRAS");
+  
+  /* First initialize the XBT */
   xbt_init_defaultlog(argc,argv,defaultlog);
-  gras_process_init(); /* calls procdata_init, which calls dynar_new */
-  /** init other submodules */
+   
+  /* module registrations: 
+   *    - declare process specific data we need (without creating them) 
+   */
+  if (gras_running_process == 0) {
+     gras_trp_register();
+     gras_msg_register();
+  }
+   
+  /*
+   * Initialize the process specific stuff
+   */
+  gras_process_init(); /* calls procdata_init, which creates process specific data for each module */
+  
+  /*
+   * 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();
@@ -36,11 +57,25 @@ void gras_init(int *argc,char **argv, const char *defaultlog) {
 
 void gras_exit(void) {
   INFO0("Exiting GRAS");
-  gras_process_exit();
   if (--gras_running_process == 0) {
     gras_msg_exit();
     gras_trp_exit();
     gras_datadesc_exit();
+    gras_emul_exit();
   }
+  gras_process_exit();
   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]);
+   }
+   printf("\n");
+}
+