From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 1 Jun 2006 23:07:50 +0000 (+0000)
Subject: GRAS is not the only one using libdata. AMOK does too, and other could. So, it is... 
X-Git-Tag: v3.3~3016
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bce83a1a83e9a84ec823da05866fb90f6f82c5e5

GRAS is not the only one using libdata. AMOK does too, and other could. So, it is possible that some fabrics get registered after the call to gras_procdata_init. In that case, the corresponding libdata won't get created on time, and we should create them afterward on need. Plus some cosmetics and bunch of paranoid self-checking


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2342 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c
index b434afe02c..1f03f73833 100644
--- a/src/gras/Virtu/process.c
+++ b/src/gras/Virtu/process.c
@@ -24,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_virtu_process,gras_virtu,"Process manipulat
 /* Functions to handle gras_procdata_t->libdata cells*/
 typedef struct {
    char *name;
-   pvoid_f_void_t *creator;
+   pvoid_f_void_t *constructor;
    void_f_pvoid_t *destructor;
 } s_gras_procdata_fabric_t, *gras_procdata_fabric_t;
 
@@ -39,7 +39,7 @@ static void gras_procdata_fabric_free(void *fab) {
  *  This is intended to be called from the gras_<module>_register function.
  *  This returns the module ID you can use for gras_libdata_by_id()
  */
-int gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t destructor) {
+int gras_procdata_add(const char *name, pvoid_f_void_t constructor,void_f_pvoid_t destructor) {
    
    gras_procdata_fabric_t fab;
    
@@ -51,9 +51,9 @@ int gras_procdata_add(const char *name, pvoid_f_void_t creator,void_f_pvoid_t de
    
    fab=xbt_dynar_push_ptr(_gras_procdata_fabrics);
    
-   fab->name       = xbt_strdup(name);
-   fab->creator    = creator;
-   fab->destructor = destructor;
+   fab->name        = xbt_strdup(name);
+   fab->constructor = constructor;
+   fab->destructor  = destructor;
    return xbt_dynar_length(_gras_procdata_fabrics)-1;
 }
 
@@ -75,6 +75,12 @@ void *gras_libdata_by_name(const char *name) {
   gras_procdata_t *pd=gras_procdata_get();
   void *res=NULL;
   xbt_ex_t e;
+
+  if (xbt_set_length(pd->libdata) < xbt_dynar_length(_gras_procdata_fabrics)) {
+     /* Damn, some new modules were added since procdata_init(). Amok? */
+     /* Get 'em all */
+     gras_procdata_init();     
+  }
    
   TRY {
     res = xbt_set_get_by_name(pd->libdata, name);
@@ -86,6 +92,11 @@ void *gras_libdata_by_name(const char *name) {
 
 void *gras_libdata_by_id(int id) {
   gras_procdata_t *pd=gras_procdata_get();
+  if (xbt_set_length(pd->libdata) < xbt_dynar_length(_gras_procdata_fabrics)) {
+     /* Damn, some new modules were added since procdata_init(). Amok? */
+     /* Get 'em all */
+     gras_procdata_init();     
+  }
   return xbt_set_get_by_id(pd->libdata, id);
 }
 
@@ -98,13 +109,24 @@ gras_procdata_init() {
    
   xbt_ex_t e;
   void *data;
+  xbt_set_elm_t elem;
 
-  pd->userdata  = NULL;
-  pd->libdata   = xbt_set_new();
+  if (!pd->libdata) {
+     pd->userdata  = NULL;
+     pd->libdata   = xbt_set_new();
+  }
    
-  xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){
+  xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){ 
     volatile int found = 0;
      
+    if (cursor+1 <= xbt_set_length(pd->libdata)) {
+       DEBUG2("Skip fabric %d: there is already %ld libdata",
+	     cursor, xbt_set_length(pd->libdata));
+       continue; /* allow to recall this function to get recently added fabrics */
+    }
+    DEBUG2("Go ahead for cursor %d, there is %ld libdata",
+	  cursor,xbt_set_length(pd->libdata));
+     
     xbt_assert1(fab.name,"Name of fabric #%d is NULL!",cursor);
     DEBUG1("Create the procdata for %s",fab.name);
     /* Check for our own errors */
@@ -118,8 +140,15 @@ gras_procdata_init() {
     if (found)
       THROW1(unknown_error,0,"MayDay: two modules use '%s' as libdata name", fab.name);
     
-    /* Add the data in place */
-    xbt_set_add(pd->libdata, (fab.creator)(), fab.destructor);
+    /* Add the data in place, after some more sanity checking */
+    elem = (fab.constructor)();
+    if (elem->name_len && elem->name_len != strlen(elem->name)) {
+       elem->name_len = strlen(elem->name);
+       WARN1("Module '%s' constructor is borken: it does not set elem->name_len",
+	     fab.name);
+    }
+     
+    xbt_set_add(pd->libdata, elem, fab.destructor);
   }
 }
 
diff --git a/src/gras/Virtu/rl_process.c b/src/gras/Virtu/rl_process.c
index 64c5f12f15..131808002c 100644
--- a/src/gras/Virtu/rl_process.c
+++ b/src/gras/Virtu/rl_process.c
@@ -16,7 +16,7 @@ static gras_procdata_t *_gras_procdata = NULL;
 char const *_gras_procname = NULL;
 
 void gras_process_init() {
-  _gras_procdata=xbt_new(gras_procdata_t,1);
+  _gras_procdata=xbt_new0(gras_procdata_t,1);
   gras_procdata_init();
 }
 void gras_process_exit() {
diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index e736fa33bd..4d1d907dcb 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -18,7 +18,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_virtu_process);
 void
 gras_process_init() {
   gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  gras_procdata_t *pd=xbt_new(gras_procdata_t,1);
+  gras_procdata_t *pd=xbt_new0(gras_procdata_t,1);
   gras_trp_procdata_t trp_pd;
   gras_sg_portrec_t prmeas,pr;
   int i;