Integrate Bruno's work on SIMIX onto main stream. Tests are broken, but it looks...

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

diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c
index 98c6481..8f2ab4d 100644 (file)
--- a/src/gras/Virtu/process.c
+++ b/src/gras/Virtu/process.c
@@ -20,7 +20,6 @@
 XBT_LOG_NEW_SUBCATEGORY(gras_virtu,gras,"Virtualization code");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_virtu_process,gras_virtu,"Process manipulation code");
 
-
 /* Functions to handle gras_procdata_t->libdata cells*/
 typedef struct {
    char *name;
@@ -54,6 +53,7 @@ int gras_procdata_add(const char *name, pvoid_f_void_t constructor,void_f_pvoid_
    fab->name        = xbt_strdup(name);
    fab->constructor = constructor;
    fab->destructor  = destructor;
+   
    return xbt_dynar_length(_gras_procdata_fabrics)-1;
 }
 
@@ -80,13 +80,11 @@ void *gras_libdata_by_name(const char *name) {
 void *gras_libdata_by_name_from_procdata(const char*name, gras_procdata_t* pd) {
   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);
   } CATCH(e) {
@@ -105,6 +103,7 @@ void *gras_libdata_by_id(int id) {
   return xbt_set_get_by_id(pd->libdata, id);
 }
 
+
 void
 gras_procdata_init() {
   gras_procdata_t *pd=gras_procdata_get();
@@ -113,14 +112,13 @@ gras_procdata_init() {
   int cursor;
    
   xbt_ex_t e;
-  void *data;
   xbt_set_elm_t elem;
 
   if (!pd->libdata) {
      pd->userdata  = NULL;
      pd->libdata   = xbt_set_new();
   }
-   
+  
   xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){ 
     volatile int found = 0;
      
@@ -136,7 +134,7 @@ gras_procdata_init() {
     DEBUG1("Create the procdata for %s",fab.name);
     /* Check for our own errors */
     TRY {
-      data = xbt_set_get_by_name(pd->libdata, fab.name);
+      xbt_set_get_by_name(pd->libdata, fab.name);
       found = 1;
     } CATCH(e) {
       xbt_ex_free(e);
@@ -152,7 +150,6 @@ gras_procdata_init() {
        WARN1("Module '%s' constructor is borken: it does not set elem->name_len",
             fab.name);
     }
-     
     xbt_set_add(pd->libdata, elem, fab.destructor);
   }
 }