X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e290fa600a4e21fd0438d02db4a8279285df3a61..18e739f580a9bfaced8b8194398fdf302382d209:/src/gras/gras.c

diff --git a/src/gras/gras.c b/src/gras/gras.c
index ed17655527..740c7a7c82 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -14,21 +14,41 @@
 #include "gras_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 */
 
+/* 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) {
+void gras_init(int *argc,char **argv) {
 
-  INFO0("Initialize GRAS");
-/*   xbt_assert0(gras_if_RL(),"Work in progress. Forget about GRAS simulation for now."); */
-  xbt_init_defaultlog(argc,argv,defaultlog);
-  gras_process_init(); /* calls procdata_init, which calls dynar_new */
-  /** init other submodules */
+  VERB0("Initialize GRAS");
+  
+  /* First initialize the XBT */
+  xbt_init(argc,argv);
+   
+  /* 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();
@@ -37,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");
+}
+