X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d788f0aa070c370acfaa33dee4004958c48c145..631d591bab136c3a757f777bacfbb302d79e739a:/src/gras/gras.c

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 1fa31cf57c..0a7ef53bd3 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -17,6 +17,7 @@
 #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 */
+#include "gras/chrono.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras,XBT_LOG_ROOT_CAT,"All GRAS categories (cf. section \ref GRAS_API)");
 static int gras_running_process = 0;
@@ -24,10 +25,27 @@ static int gras_running_process = 0;
 void gras_init(int *argc,char **argv, const char *defaultlog) {
 
   INFO0("Initialize GRAS");
-  xbt_assert0(gras_if_RL(),"Work in progress. Forget about GRAS simulation for now.");
+  
+  /* First initialize the XBT */
   xbt_init_defaultlog(argc,argv,defaultlog);
-  gras_process_init(); /* calls procdata_init, which calls dynar_new */
-  /** init other submodules */
+   
+  /*gras_chrono_init(); * FIXME: Arnaud, WTF?? It depends on MSG!! */
+  /* 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_msg_init();
     gras_trp_init();