X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a7067e48184aafdfc20d69e1dc6a58add7c415c..f5e363e6dba846da390b665e0e4caa7ee90b2786:/src/gras/gras.c

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 897e7f583d..f2009c8ecc 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -17,18 +17,34 @@
 #include "gras/core.h"
 #include "gras/process.h" /* FIXME: killme and put process_init in modinter */
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(gras,"All GRAS categories");
+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");
-  CRITICAL0("Go Away ! Work in progress  ");
-  xbt_assert0(0, "GO TO HELL! ]:)"); 
+  
+  /* 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();
@@ -42,6 +58,20 @@ void gras_exit(void) {
     gras_msg_exit();
     gras_trp_exit();
     gras_datadesc_exit();
+    gras_emul_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");
+}
+