This data is used within the TRY/CATCH block; mark it volatile to avoid issues on...

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

diff --git a/src/gras/Virtu/process.c b/src/gras/Virtu/process.c
index 27b401a..7a22286 100644 (file)
--- a/src/gras/Virtu/process.c
+++ b/src/gras/Virtu/process.c
@@ -7,9 +7,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "xbt/ex.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "xbt/error.h"
 #include "gras/transport.h"
 #include "gras/datadesc.h"
 #include "gras/messages.h"
@@ -17,7 +17,8 @@
 
 #include "gras/Virtu/virtu_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(process,gras,"Process manipulation code");
+XBT_LOG_NEW_SUBCATEGORY(virtu,gras,"Virtualization code");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(process,virtu,"Process manipulation code");
 
 
 /* Functions to handle gras_procdata_t->libdata cells*/
@@ -70,14 +71,14 @@ void gras_userdata_set(void *ud) {
 
 void *gras_libdata_get(const char *name) {
   gras_procdata_t *pd=gras_procdata_get();
-  void *res;
-  xbt_error_t errcode;
-   
-  errcode = xbt_dict_get(pd->libdata, name, &res);
-  xbt_assert2(errcode == no_error, 
-             "Cannot retrive the libdata associated to %s: %s",
-             name, xbt_error_name(errcode));
+  void *res=NULL;
+  xbt_ex_t e;
    
+  TRY {
+    res = xbt_dict_get(pd->libdata, name);
+  } CATCH(e) {
+    RETHROW1("Cannot retrive the libdata associated to %s: %s",name);
+  }   
   return res;
 }
 
@@ -88,30 +89,43 @@ gras_procdata_init() {
    
   int cursor;
    
-  xbt_error_t errcode;
+  xbt_ex_t e;
   void *data;
 
   pd->userdata  = NULL;
   pd->libdata   = xbt_dict_new();
    
   xbt_dynar_foreach(_gras_procdata_fabrics,cursor,fab){
+    volatile int found = 0;
      
-     xbt_assert1(fab.name,"Name of fabric #%d is NULL!",cursor);
-     DEBUG1("Create the procdata for %s",fab.name);
-     /* Check for our own errors */
-     errcode = xbt_dict_get(pd->libdata, fab.name, &data);
-     xbt_assert1(errcode == mismatch_error,
-                "MayDay: two modules use '%s' as libdata name", fab.name);
-     
-     /* Add the data in place */
-     xbt_dict_set(pd->libdata, fab.name, (fab.creator)(), fab.destructor);
-
+    xbt_assert1(fab.name,"Name of fabric #%d is NULL!",cursor);
+    DEBUG1("Create the procdata for %s",fab.name);
+    /* Check for our own errors */
+    TRY {
+      data = xbt_dict_get(pd->libdata, fab.name);
+      found = 1;
+    } CATCH(e) {
+      xbt_ex_free(e);
+      found = 0;
+    }
+    if (found)
+      THROW1(unknown_error,0,"MayDay: two modules use '%s' as libdata name", fab.name);
+    
+    /* Add the data in place */
+    xbt_dict_set(pd->libdata, fab.name, (fab.creator)(), fab.destructor);
   }
 }
 
 void
 gras_procdata_exit() {
+  int len;
   gras_procdata_t *pd=gras_procdata_get();
 
   xbt_dict_free(&( pd->libdata ));
+  
+  /* Remove procdata in reverse order wrt creation */
+  while ((len=xbt_dynar_length(_gras_procdata_fabrics))) {
+    xbt_dynar_remove_at(_gras_procdata_fabrics,len-1,NULL);
+  }
+  xbt_dynar_free( & _gras_procdata_fabrics );
 }